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

MDEV-20939: Race condition between mysqldump import and InnoDB persistent

Browse Source 
statistics calculation

mysqldump --system=stats and --system=timezones by default used
ordinary INSERT statements populate EITS, innodb stats, and timezone tables.

As these all have primary keys it could result in conflict.

The behavior desired with --system= is to replace the tables.
As such we assume --replace for the purposes of stats and timezone tables
there if --insert-ignore isn't specified.
This commit is contained in:
Daniel Black
2021-01-22 16:03:07 +11:00
parent 1a99958545
commit c58d2c941c
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/mysqldump.c
View File

@ -4640,7 +4640,7 @@ static int dump_all_servers()
static int dump_all_stats() static int dump_all_stats()
{ {
my_bool prev_no_create_info; my_bool prev_no_create_info, prev_opt_replace_into;
if (mysql_select_db(mysql, "mysql")) if (mysql_select_db(mysql, "mysql"))
{ {
@ -4648,6 +4648,8 @@ static int dump_all_stats()
return 1; /* If --force */ return 1; /* If --force */
} }
fprintf(md_result_file,"\nUSE mysql;\n"); fprintf(md_result_file,"\nUSE mysql;\n");
prev_opt_replace_into= opt_replace_into;
opt_replace_into|= !opt_ignore;
prev_no_create_info= opt_no_create_info; prev_no_create_info= opt_no_create_info;
opt_no_create_info= 1; /* don't overwrite recreate tables */ opt_no_create_info= 1; /* don't overwrite recreate tables */
/* EITS added in 10.0.1 */ /* EITS added in 10.0.1 */
@ -4666,6 +4668,7 @@ static int dump_all_stats()
dump_table("innodb_table_stats", "mysql", NULL, 0); dump_table("innodb_table_stats", "mysql", NULL, 0);
} }
opt_no_create_info= prev_no_create_info; opt_no_create_info= prev_no_create_info;
opt_replace_into= prev_opt_replace_into;
return 0; return 0;
} }
@ -4676,12 +4679,14 @@ static int dump_all_stats()
static int dump_all_timezones() static int dump_all_timezones()
{ {
my_bool opt_prev_no_create_info; my_bool opt_prev_no_create_info, opt_prev_replace_into;
if (mysql_select_db(mysql, "mysql")) if (mysql_select_db(mysql, "mysql"))
{ {
DB_error(mysql, "when selecting the database"); DB_error(mysql, "when selecting the database");
return 1; /* If --force */ return 1; /* If --force */
} }
opt_prev_replace_into= opt_replace_into;
opt_replace_into|= !opt_ignore;
opt_prev_no_create_info= opt_no_create_info; opt_prev_no_create_info= opt_no_create_info;
opt_no_create_info= 1; opt_no_create_info= 1;
fprintf(md_result_file,"\nUSE mysql;\n"); fprintf(md_result_file,"\nUSE mysql;\n");
@ -4691,6 +4696,7 @@ static int dump_all_timezones()
dump_table("time_zone_transition", "mysql", NULL, 0); dump_table("time_zone_transition", "mysql", NULL, 0);
dump_table("time_zone_transition_type", "mysql", NULL, 0); dump_table("time_zone_transition_type", "mysql", NULL, 0);
opt_no_create_info= opt_prev_no_create_info; opt_no_create_info= opt_prev_no_create_info;
opt_replace_into= opt_prev_replace_into;
return 0; return 0;
} }

20
mysql-test/r/mysqldump-system.result
View File

File diff suppressed because one or more lines are too long