database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-05-09 12:35:11 +02:00
parent 229dad1f9b 124428a9e2
commit d3e2e1243b
1865 changed files with 98295 additions and 85893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
client/mysqldump.c
View File

@@ -604,12 +604,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);
}
@@ -618,18 +618,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);
}
@@ -1002,7 +1002,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)
@@ -1502,12 +1502,13 @@ static void free_resources()
static void maybe_exit(int error)
{
if (opt_slave_data)
do_start_slave_sql(mysql);
if (!first_error)
first_error= error;
if (ignore_errors)
return;
ignore_errors= 1; /* don't want to recurse, if something fails below */
if (opt_slave_data)
do_start_slave_sql(mysql);
if (mysql)
mysql_close(mysql);
free_resources();
@@ -5799,8 +5800,8 @@ int main(int argc, char **argv)
*/
err:
/* if --dump-slave , start the slave sql thread */
if (opt_slave_data && do_start_slave_sql(mysql))
goto err;
if (opt_slave_data)
do_start_slave_sql(mysql);
#ifdef HAVE_SMEM
my_free(shared_memory_base_name);