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

MDEV-16733 mysqldump --tab and --xml options are conflicting

Browse Source
This commit is contained in:
Sergei Golubchik
2022-09-17 23:35:05 +02:00
parent a3dbd5de44
commit a39b4848e4
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysqldump.c
View File

@ -1350,6 +1350,11 @@ static int get_options(int *argc, char ***argv)
my_progname_short); my_progname_short);
return(EX_USAGE); return(EX_USAGE);
} }
if (opt_xml && path)
{
fprintf(stderr, "%s: --xml can't be used with --tab.\n", my_progname_short);
return(EX_USAGE);
}
if (opt_asof_timestamp && strchr(opt_asof_timestamp, '\'')) if (opt_asof_timestamp && strchr(opt_asof_timestamp, '\''))
{ {
fprintf(stderr, "%s: Incorrect DATETIME value: '%s'\n", fprintf(stderr, "%s: Incorrect DATETIME value: '%s'\n",

1
mysql-test/main/mysqldump.result
View File

@ -6584,3 +6584,4 @@ SET GLOBAL LOG_OUTPUT=DEFAULT, GLOBAL GENERAL_LOG=@save_general_log;
TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE mysql.general_log;
DROP DATABASE test1; DROP DATABASE test1;
# End of 10.3 tests # End of 10.3 tests
mysqldump: --xml can't be used with --tab.

7
mysql-test/main/mysqldump.test
View File

@ -2980,3 +2980,10 @@ DROP DATABASE test1;
--remove_file $MYSQLTEST_VARDIR/tmp/dumptest1.sql --remove_file $MYSQLTEST_VARDIR/tmp/dumptest1.sql
--echo # End of 10.3 tests --echo # End of 10.3 tests
#
# MDEV-16733 mysqldump --tab and --xml options are conflicting
#
--replace_result mysqldump.exe mysqldump
--error 1
--exec $MYSQL_DUMP --xml --tab=$MYSQLTEST_VARDIR/tmp 2>&1