Commit b5351740 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/ram/work/b25993/b25993.5.0 

into  mysql.com:/home/ram/work/b25993/b25993.5.1


client/mysqldump.c:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
parents 7cf2e15d 9b2e0127

client/mysqldump.c

+3 −3
Original line number Diff line number Diff line
@@ -2016,7 +2016,7 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
      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 *table, char *db, char *table_type, 
          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 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
      check_io(sql_file);

    }

  }

  if (opt_complete_insert)

  if (complete_insert)

  {

    dynstr_append_checked(&insert_pat, ") VALUES ");

    if (!extended_insert)

mysql-test/t/mysqldump.test

+10 −0
Original line number Diff line number Diff line
@@ -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 #