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

Fix for bug #25993: mysqldump crashes with merge table and -c option

opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.
This commit is contained in:
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2007-03-26 12:56:41 +05:00
parent 53ecf4207e
commit 74b3cdb02e
3 changed files with 60 additions and 3 deletions

View File

@ -1857,7 +1857,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
{
@ -1881,7 +1881,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)
@ -2039,7 +2039,7 @@ continue_xml:
check_io(sql_file);
}
}
if (opt_complete_insert)
if (complete_insert)
{
dynstr_append_checked(&insert_pat, ") VALUES ");
if (!extended_insert)