From 799993352850b685c761a7d4489753c00df0c9a4 Mon Sep 17 00:00:00 2001
From: "mwagner@evoq.home.mwagner.org" <>
Date: Thu, 28 Dec 2000 22:58:16 -0600
Subject: mysqltest.c	Added --no-defaults to usage(). mysql-test-run.sh
 Couple more clean-ups.

---
 client/mysqltest.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'client/mysqltest.c')

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 0c1efae62d6..09780c343e0 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -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;
-- 
cgit v1.2.1


From a70656791d51934ef3eeee47f6a03bf8d24a4e43 Mon Sep 17 00:00:00 2001
From: "mwagner@evoq.home.mwagner.org" <>
Date: Thu, 28 Dec 2000 23:05:08 -0600
Subject: mysqltest.c	Clean-ups.

---
 client/mysqltest.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'client/mysqltest.c')

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 09780c343e0..18507879dfb 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -950,8 +950,6 @@ int read_query(struct query** q_ptr)
   return 0;
 }
 
-enum options {OPT_NODEFAULTS} ;
-
 struct option long_options[] =
 {
   {"verbose", no_argument, 0, 'v'},
@@ -1030,7 +1028,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;
-- 
cgit v1.2.1