mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
mysqltest.c Added --no-defaults to usage().
mysql-test-run.sh Couple more clean-ups. mysql-test/mysql-test-run.sh: Couple more clean-ups. client/mysqltest.c: Added --no-defaults to usage().
This commit is contained in:
@@ -950,6 +950,8 @@ int read_query(struct query** q_ptr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
enum options {OPT_NODEFAULTS} ;
|
||||
|
||||
struct option long_options[] =
|
||||
{
|
||||
{"verbose", no_argument, 0, 'v'},
|
||||
@@ -992,10 +994,11 @@ void usage()
|
||||
-P, --port=... Port number to use for connection.\n\
|
||||
-S, --socket=... Socket file to use for connection.\n\
|
||||
-r, --record Record output of test_file into result file.\n\
|
||||
-R, --result-file=... Read/Store result from/in this file\n\
|
||||
-R, --result-file=... Read/Store result from/in this file.\n\
|
||||
-v, --verbose Write more.\n\
|
||||
-q, --quiet, --silent Suppress all normal output.\n\
|
||||
-V, --version Output version information and exit.\n\n");
|
||||
-V, --version Output version information and exit.\n\
|
||||
--no-defaults Don't read default options from any options file.\n\n");
|
||||
}
|
||||
|
||||
int parse_args(int argc, char **argv)
|
||||
@@ -1004,6 +1007,7 @@ int parse_args(int argc, char **argv)
|
||||
my_bool tty_password=0;
|
||||
|
||||
load_defaults("my",load_default_groups,&argc,&argv);
|
||||
|
||||
while((c = getopt_long(argc, argv, "h:p::u:P:D:S:R:?rvVq",
|
||||
long_options, &option_index)) != EOF)
|
||||
{
|
||||
@@ -1026,7 +1030,7 @@ int parse_args(int argc, char **argv)
|
||||
{
|
||||
my_free(pass,MYF(MY_ALLOW_ZERO_PTR));
|
||||
pass=my_strdup(optarg,MYF(MY_FAE));
|
||||
while (*optarg) *optarg++= 'x'; /* Destroy argument */
|
||||
while (*optarg) *optarg++= 'x'; // Destroy argument
|
||||
}
|
||||
else
|
||||
tty_password=1;
|
||||
|
Reference in New Issue
Block a user