database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/ram/work/b25993/b25993.5.1
This commit is contained in:
ramil/ram@ramil.myoffice.izhnet.ru
2007-03-26 13:01:46 +05:00
parent 6a7ef1849a 74b3cdb02e
commit f5a24e5870
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqldump.c
View File

@ -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, insert_option);
dynstr_append_checked(&insert_pat, "INTO "); dynstr_append_checked(&insert_pat, "INTO ");
dynstr_append_checked(&insert_pat, result_table); dynstr_append_checked(&insert_pat, result_table);
if (opt_complete_insert) if (complete_insert)
dynstr_append_checked(&insert_pat, " ("); dynstr_append_checked(&insert_pat, " (");
else else
{ {
@ -2040,7 +2040,7 @@ static uint get_table_structure(char *table, char *db, char *table_type,
dynstr_append_checked(&insert_pat, ", "); dynstr_append_checked(&insert_pat, ", ");
} }
init=1; init=1;
if (opt_complete_insert) if (complete_insert)
dynstr_append_checked(&insert_pat, dynstr_append_checked(&insert_pat,
quote_name(row[SHOW_FIELDNAME], name_buff, 0)); quote_name(row[SHOW_FIELDNAME], name_buff, 0));
if (!opt_no_create_info) if (!opt_no_create_info)
@ -2198,7 +2198,7 @@ continue_xml:
check_io(sql_file); check_io(sql_file);
} }
} }
if (opt_complete_insert) if (complete_insert)
{ {
dynstr_append_checked(&insert_pat, ") VALUES "); dynstr_append_checked(&insert_pat, ") VALUES ");
if (!extended_insert) if (!extended_insert)

10
mysql-test/t/mysqldump.test
View File

@ -1455,6 +1455,16 @@ INSERT INTO t1 VALUES (1), (2);
DROP TABLE t1; 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 #
--echo # End of 5.0 tests --echo # End of 5.0 tests
--echo # --echo #