bk commit into 4.1 tree (1.1421)

Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1421 02/12/31 18:01:53 Sinisa@xxxxxxxxxxxxxxxxxxxx +3 -0
  A fix for a charset bug in the select_export (select into 
  outfile) class.

  sql/item.cc
    1.69 02/12/31 18:01:46 Sinisa@xxxxxxxxxxxxxxxxxxxx +1 -0
    A fix for a charset bug in the select_export (select into 
    outfile) class.

  sql/field.cc
    1.94 02/12/31 18:01:46 Sinisa@xxxxxxxxxxxxxxxxxxxx +0 -1
    A fix for a charset bug in the select_export (select into 
    outfile) class.

  mysql-test/t/outfile.test
    1.5 02/12/31 18:01:46 Sinisa@xxxxxxxxxxxxxxxxxxxx +3 -3
    A fix for a charset bug in the select_export (select into 
    outfile) class.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: Sinisa
# Host: sinisa.nasamreza.org
# Root: /mnt/work/mysql-4.1

--- 1.93/sql/field.cc   Mon Dec 30 16:27:52 2002
+++ 1.94/sql/field.cc   Tue Dec 31 18:01:46 2002
@@ -2844,7 +2844,6 @@
   val_buffer->alloc(field_length+1);
   char *to=(char*) val_buffer->ptr(),*end=to+field_length;
   val_buffer->length(field_length);
-  val_buffer->set_charset(val_ptr->charset());
 
 #ifdef WORDS_BIGENDIAN
   if (table->db_low_byte_first)

--- 1.68/sql/item.cc    Mon Dec 30 16:27:53 2002
+++ 1.69/sql/item.cc    Tue Dec 31 18:01:46 2002
@@ -220,6 +220,7 @@
 {
   if ((null_value=result_field->is_null()))
     return 0;
+  str->set_charset(str_value.charset());
   return result_field->val_str(str,&str_value);
 }
 

--- 1.4/mysql-test/t/outfile.test       Sat Dec 28 21:34:12 2002
+++ 1.5/mysql-test/t/outfile.test       Tue Dec 31 18:01:46 2002
@@ -22,7 +22,7 @@
 #select load_file("/tmp/select-test.not-exist");
 #drop table t1;
 #drop table if exists t;
-#CREATE TABLE t (  t timestamp NOT NULL,  c char(200) character set latin1 NOT 
NULL default '',  KEY t (t)) TYPE=MyISAM;
-#INSERT INTO t VALUES ('2002-12-20 12:01:20','');
-#select * from t into outfile "fdg";
+#CREATE TABLE t (  t timestamp NOT NULL,  c char(200) character set latin1 NOT 
NULL default '',  i int(11), v varchar(200), b blob, KEY t (t)) TYPE=MyISAM;
+#INSERT INTO t VALUES ('2002-12-20 12:01:20','',1,"aaa","bbb");
+#select * from t into outfile "check";
 #drop table if exists t;

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread6275@xxxxxxxxxxxxxxx
To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>