bk commit into 5.0 tree (gshchepa:1.2531) BUG#30946

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.0 repository of gshchepa. When gshchepa 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-26 18:22:25+02:00, gshchepa@stripped +5 -0
  Fixed bug #30946.
  When mysqldump was used with both --default-character-set and
  --tab options the database content in tab-separated data files
  was always in its internal character set and the
  --default-character-set switch was ignored.
  
  The mysqldump client uses the "SELECT * INTO OUTFILE" statement
  to provide the --tab command line switch logic. It is supposed
  to use the symmetrical "LOAD DATA INFILE" statement to load a
  resulting data file back to a database.
  By the definition the "LOAD DATA INFILE" statement interprets
  all fields in the file as having the same character set, regardless
  of the data types of the columns into which field values are loaded.
  The character_set_database system variable or the "CHARACTER
  SET" closure of the "LOAD DATA INFILE" statement is used to define
  that character set. However, the "SELECT ... INTO OUTFILE" statement
  dumps table fields in its internal character sets, so "SELECT INTO
  OUTFILE" and "LOAD DATA INFILE" statements are not symmetrical.
  To not to modify current server semantic (only to extend it) the
  "SELECT ... INTO OUTFILE" statement syntax was extended with the
  "CHARACTER SET" statement like in the "LOAD DATA INFILE".
  
  Documentation should be updated:
  [ http://dev.mysql.com/doc/refman/5.1/en/select.html ]
  SELECT ... INTO OUTFILE is the complement of LOAD DATA INFILE;
  the syntax for the export_options part of the statement consists of
  the same CHARACTER SET, FIELDS and LINES clauses that are used with
          +^^^^^^^^^^^^^^
  the LOAD DATA INFILE statement. 

  client/mysqldump.c@stripped, 2007-09-26 18:21:24+02:00, gshchepa@stripped +6 -0
    Fixed bug #30946.
    The dump_table function has been modified to take the
    --default-character-set into account when dumpind a table
    into into external file.

  mysql-test/r/mysqldump.result@stripped, 2007-09-26 18:21:35+02:00,
gshchepa@stripped +12 -0
    Added test case for bug #30946.

  mysql-test/t/mysqldump.test@stripped, 2007-09-26 18:21:32+02:00,
gshchepa@stripped +22 -0
    Added test case for bug #30946.

  sql/sql_class.cc@stripped, 2007-09-26 18:21:30+02:00, gshchepa@stripped +20 -0
    Fixed bug #30946.
    The select_export::send_data function has been modified to support
    new 'SELECT ... INFO OUTFILE ... CHARACTER SET' syntax.
    Without a presence of the CHARACTER SET closure the behavior of this
    function is unchanged.

  sql/sql_yacc.yy@stripped, 2007-09-26 18:21:27+02:00, gshchepa@stripped +2 -0
    Fixed bug #30946. 
    New syntax has been provided:
    SELECT ... INTO OUTFILE ... [CHARACTER SET ...].
    This new closure syntax is symmetrical to the 'LOAD DATA
    INFILE' statement 'CHARACTER SET' clause.

diff -Nrup a/client/mysqldump.c b/client/mysqldump.c
--- a/client/mysqldump.c	2007-08-31 13:53:54 +02:00
+++ b/client/mysqldump.c	2007-09-26 18:21:24 +02:00
@@ -2381,6 +2381,12 @@ static void dump_table(char *table, char
     dynstr_append_checked(&query_string, filename);
     dynstr_append_checked(&query_string, "'");
 
+    if (default_charset != mysql_universal_client_charset)
+    {
+      dynstr_append_checked(&query_string, " CHARACTER SET ");
+      dynstr_append_checked(&query_string, default_charset);
+    }
+
     if (fields_terminated || enclosed || opt_enclosed || escaped)
       dynstr_append_checked(&query_string, " FIELDS");
     
diff -Nrup a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
--- a/mysql-test/r/mysqldump.result	2007-07-31 18:00:52 +02:00
+++ b/mysql-test/r/mysqldump.result	2007-09-26 18:21:35 +02:00
@@ -3544,5 +3544,17 @@ c1
 2
 DROP TABLE t1,t2;
 #
+# Bug #30946: mysqldump silently ignores --default-character-set
+#             when used with --tab
+#
+CREATE TABLE t1 (a  CHAR(10));
+INSERT INTO t1  VALUES (_latin1 'ÀÁÂÃÄÅ ');
+SELECT * INTO OUTFILE '/data0/gshchepa/30946/5.0-opt/mysql-test/var/tmp/t1_default.txt'
FROM t1;;
+ÀÁÂÃÄÅ
+SELECT * INTO OUTFILE '/data0/gshchepa/30946/5.0-opt/mysql-test/var/tmp/t1_utf8.txt'
CHARACTER SET utf8 FROM t1;;
+ÀÁÂÃÄÅ
+ÀÁÂÃÄÅ
+DROP TABLE t1;
+#
 # End of 5.0 tests
 #
diff -Nrup a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
--- a/mysql-test/t/mysqldump.test	2007-07-21 01:49:17 +02:00
+++ b/mysql-test/t/mysqldump.test	2007-09-26 18:21:32 +02:00
@@ -1577,5 +1577,27 @@ SELECT * FROM t2;
 DROP TABLE t1,t2;
 
 --echo #
+--echo # Bug #30946: mysqldump silently ignores --default-character-set
+--echo #             when used with --tab
+--echo #
+
+CREATE TABLE t1 (a  CHAR(10));
+INSERT INTO t1  VALUES (_latin1 'ÀÁÂÃÄÅ ');
+
+--eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1_default.txt' FROM t1;
+--exec cat $MYSQLTEST_VARDIR/tmp/t1_default.txt
+--exec rm -f $MYSQLTEST_VARDIR/tmp/t1_default.txt
+
+--eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1_utf8.txt' CHARACTER SET utf8 FROM
t1;
+--exec cat $MYSQLTEST_VARDIR/tmp/t1_utf8.txt
+--exec rm -f $MYSQLTEST_VARDIR/tmp/t1_utf8.txt
+
+--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --default-character-set=utf8
--tab=$MYSQLTEST_VARDIR/tmp/ test t1
+--exec cat $MYSQLTEST_VARDIR/tmp/t1.txt
+--exec rm -f $MYSQLTEST_VARDIR/tmp/t1.txt
+
+DROP TABLE t1;
+
+--echo #
 --echo # End of 5.0 tests
 --echo #
diff -Nrup a/sql/sql_class.cc b/sql/sql_class.cc
--- a/sql/sql_class.cc	2007-08-02 02:39:10 +02:00
+++ b/sql/sql_class.cc	2007-09-26 18:21:30 +02:00
@@ -1243,8 +1243,15 @@ bool select_export::send_data(List<Item>
 
   DBUG_ENTER("select_export::send_data");
   char buff[MAX_FIELD_WIDTH],null_buff[2],space[MAX_FIELD_WIDTH];
+  char buff2[MAX_FIELD_WIDTH];
   bool space_inited=0;
   String tmp(buff,sizeof(buff),&my_charset_bin),*res;
+  /*
+    String to convert an item string value into a value with
+    the exchange->cs chanrset
+  */
+  String item2exch(buff2, sizeof(buff2),
+                   exchange->cs ? exchange->cs : &my_charset_bin);
   tmp.length(0);
 
   if (unit->offset_limit_cnt)
@@ -1264,6 +1271,19 @@ bool select_export::send_data(List<Item>
   {
     Item_result result_type=item->result_type();
     res=item->str_result(&tmp);
+    if (exchange->cs && exchange->cs != res->charset())
+    {
+      res= item->str_result(&tmp);
+      item2exch.length(0);
+      /*
+        Simple item2exch.append(*res) doesn't convert anything,
+        String::append(const char, uing32, CHARSET_INFO*) has been used instead
+        of that.
+        TODO: fix String::append(const String&).
+      */
+      item2exch.append(res->c_ptr(), res->length(), res->charset());
+      res= &item2exch;
+    }
     if (res && (!exchange->opt_enclosed || result_type == STRING_RESULT))
     {
       if (my_b_write(&cache,(byte*) exchange->enclosed->ptr(),
diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2007-09-12 20:39:32 +02:00
+++ b/sql/sql_yacc.yy	2007-09-26 18:21:27 +02:00
@@ -6433,6 +6433,8 @@ into_destination:
               !(lex->result= new select_export(lex->exchange)))
             MYSQL_YYABORT;
 	}
+        opt_load_data_charset
+        { Lex->exchange->cs= $4; }
 	opt_field_term opt_line_term
 	| DUMPFILE TEXT_STRING_filesystem
 	{