diff options
| -rw-r--r-- | client/mysqldump.c | 5 | ||||
| -rw-r--r-- | mysql-test/main/mysqldump.result | 1 | ||||
| -rw-r--r-- | mysql-test/main/mysqldump.test | 7 |
3 files changed, 13 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 12258322900..1d23eebd642 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1350,6 +1350,11 @@ static int get_options(int *argc, char ***argv) my_progname_short); 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, '\'')) { fprintf(stderr, "%s: Incorrect DATETIME value: '%s'\n", diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result index c3e51542aa2..0191238ce71 100644 --- a/mysql-test/main/mysqldump.result +++ b/mysql-test/main/mysqldump.result @@ -6584,3 +6584,4 @@ SET GLOBAL LOG_OUTPUT=DEFAULT, GLOBAL GENERAL_LOG=@save_general_log; TRUNCATE TABLE mysql.general_log; DROP DATABASE test1; # End of 10.3 tests +mysqldump: --xml can't be used with --tab. diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test index c093c5e7cd8..c03ae71b539 100644 --- a/mysql-test/main/mysqldump.test +++ b/mysql-test/main/mysqldump.test @@ -2980,3 +2980,10 @@ DROP DATABASE test1; --remove_file $MYSQLTEST_VARDIR/tmp/dumptest1.sql --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 |