Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a39b4848
Commit
a39b4848
authored
Sep 17, 2022
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-16733 mysqldump --tab and --xml options are conflicting
parent
a3dbd5de
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
client/mysqldump.c
client/mysqldump.c
+5
-0
mysql-test/main/mysqldump.result
mysql-test/main/mysqldump.result
+1
-0
mysql-test/main/mysqldump.test
mysql-test/main/mysqldump.test
+7
-0
No files found.
client/mysqldump.c
View file @
a39b4848
...
@@ -1350,6 +1350,11 @@ static int get_options(int *argc, char ***argv)
...
@@ -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
"
,
...
...
mysql-test/main/mysqldump.result
View file @
a39b4848
...
@@ -6584,3 +6584,4 @@ SET GLOBAL LOG_OUTPUT=DEFAULT, GLOBAL GENERAL_LOG=@save_general_log;
...
@@ -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.
mysql-test/main/mysqldump.test
View file @
a39b4848
...
@@ -2980,3 +2980,10 @@ DROP DATABASE test1;
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment