5.5 merge

This commit is contained in:
Sergei Golubchik 2014-02-01 00:54:03 +01:00
commit 59d9d08e2b
304 changed files with 12471 additions and 940 deletions

View file

@ -7022,8 +7022,9 @@ void usage()
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
printf("Runs a test against the mysql server and compares output with a results file.\n\n");
printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);
print_defaults("my",load_default_groups);
puts("");
my_print_help(my_long_options);
printf(" --no-defaults Don't read default options from any options file.\n");
my_print_variables(my_long_options);
}