mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-6056 [PATCH] mysqldump writes usage to stdout even when not explicitly requested

Browse source
This commit is contained in:
Sergei Golubchik 2014-05-05 14:24:25 +02:00
parent 5401d44708
commit a313864814
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
client/mysqldump.c
View file

@ -598,12 +598,12 @@ static void print_version(void)
} /* print_version */
static void short_usage_sub(void)
static void short_usage_sub(FILE *f)
{
printf("Usage: %s [OPTIONS] database [tables]\n", my_progname_short);
printf("OR %s [OPTIONS] --databases [OPTIONS] DB1 [DB2 DB3...]\n",
my_progname_short);
printf("OR %s [OPTIONS] --all-databases [OPTIONS]\n", my_progname_short);
fprintf(f, "Usage: %s [OPTIONS] database [tables]\n", my_progname_short);
fprintf(f, "OR %s [OPTIONS] --databases [OPTIONS] DB1 [DB2 DB3...]\n",
my_progname_short);
fprintf(f, "OR %s [OPTIONS] --all-databases [OPTIONS]\n", my_progname_short);
}
@ -612,18 +612,18 @@ static void usage(void)
print_version();
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
puts("Dumping structure and contents of MySQL databases and tables.");
short_usage_sub();
short_usage_sub(stdout);
print_defaults("my",load_default_groups);
puts("");
my_print_help(my_long_options);
my_print_help(my_long_options);
my_print_variables(my_long_options);
} /* usage */
static void short_usage(void)
static void short_usage(FILE *f)
{
short_usage_sub();
printf("For more options, use %s --help\n", my_progname_short);
short_usage_sub(f);
fprintf(f, "For more options, use %s --help\n", my_progname_short);
}
@ -996,7 +996,7 @@ static int get_options(int *argc, char ***argv)
exit(1);
if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs))
{
short_usage();
short_usage(stderr);
return EX_USAGE;
}
if (tty_password)

4
mysql-test/r/mysqldump.result
View file

@ -5281,3 +5281,7 @@ drop table t1, t2;
#
# End of 5.1 tests
#
Usage: mysqldump [OPTIONS] database [tables]
OR mysqldump [OPTIONS] --databases [OPTIONS] DB1 [DB2 DB3...]
OR mysqldump [OPTIONS] --all-databases [OPTIONS]
For more options, use mysqldump --help

7
mysql-test/t/mysqldump.test
View file

@ -2462,3 +2462,10 @@ drop table t1, t2;
--error 2
--exec $MYSQL_DUMP -hunknownhost --dump-slave nulldb
#
# MDEV-6056 [PATCH] mysqldump writes usage to stdout even when not explicitly requested
#
--error 1
--exec $MYSQL_DUMP --user=foo 2>&1 > $MYSQLTEST_VARDIR/tmp/bug6056.out
--exec $MYSQL_DUMP --help > $MYSQLTEST_VARDIR/tmp/bug6056.out