bk commit into 5.1 tree (ramil:1.2507)

[ramil]

Below is the list of changes that have just been committed into a local
5.1 repository of ram. When ram 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-03-26 13:01:46+05:00, ramil@stripped +3 -0
  Merge mysql.com:/home/ram/work/b25993/b25993.5.0
  into  mysql.com:/home/ram/work/b25993/b25993.5.1
  MERGE: 1.1810.2374.91

  client/mysqldump.c@stripped, 2007-03-26 13:01:37+05:00, ramil@stripped +0
-0
    Auto merged
    MERGE: 1.214.1.46

  mysql-test/r/mysqldump.result@stripped, 2007-03-26 13:01:41+05:00,
ramil@stripped +0 -47
    MERGE: 1.83.1.38

  mysql-test/t/mysqldump.test@stripped, 2007-03-26 13:01:38+05:00,
ramil@stripped +0 -0
    Auto merged
    MERGE: 1.76.1.36

# 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:	ramil
# Host:	ramil.myoffice.izhnet.ru
# Root:	/home/ram/work/b25993/b25993.5.1/RESYNC

--- 1.273/client/mysqldump.c	2007-03-26 13:01:51 +05:00
+++ 1.274/client/mysqldump.c	2007-03-26 13:01:51 +05:00
@@ -2016,7 +2016,7 @@ static uint get_table_structure(char *ta
       dynstr_append_checked(&insert_pat, insert_option);
       dynstr_append_checked(&insert_pat, "INTO ");
       dynstr_append_checked(&insert_pat, result_table);
-      if (opt_complete_insert)
+      if (complete_insert)
         dynstr_append_checked(&insert_pat, " (");
       else
       {
@@ -2040,7 +2040,7 @@ static uint get_table_structure(char *ta
           dynstr_append_checked(&insert_pat, ", ");
       }
       init=1;
-      if (opt_complete_insert)
+      if (complete_insert)
         dynstr_append_checked(&insert_pat,
                       quote_name(row[SHOW_FIELDNAME], name_buff, 0));
       if (!opt_no_create_info)
@@ -2198,7 +2198,7 @@ continue_xml:
       check_io(sql_file);
     }
   }
-  if (opt_complete_insert)
+  if (complete_insert)
   {
     dynstr_append_checked(&insert_pat, ") VALUES ");
     if (!extended_insert)

--- 1.131/mysql-test/t/mysqldump.test	2007-03-26 13:01:51 +05:00
+++ 1.132/mysql-test/t/mysqldump.test	2007-03-26 13:01:51 +05:00
@@ -1455,6 +1455,16 @@ INSERT INTO t1 VALUES (1), (2);
 
 DROP TABLE t1;
 
+#
+# Bug #25993: crashe with a merge table and -c
+#
+
+CREATE TABLE t2 (a int);
+CREATE TABLE t3 (a int);
+CREATE TABLE t1 (a int) ENGINE=merge UNION=(t2, t3);
+--exec $MYSQL_DUMP --skip-comments -c test
+DROP TABLE t1, t2, t3;
+
 --echo #
 --echo # End of 5.0 tests
 --echo #