summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore13
-rw-r--r--myisam/myisamchk.c10
2 files changed, 18 insertions, 5 deletions
diff --git a/.bzrignore b/.bzrignore
index 162872e39cf..27fb593c662 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -909,3 +909,16 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
+Docs/Images/myaccess-odbc.txt
+Docs/Images/myaccess.txt
+Docs/Images/myarchitecture.txt
+Docs/Images/mydll-properties.txt
+Docs/Images/mydsn-example.txt
+Docs/Images/mydsn-icon.txt
+Docs/Images/mydsn-options.txt
+Docs/Images/mydsn-setup.txt
+Docs/Images/mydsn-test-fail.txt
+Docs/Images/mydsn-test-success.txt
+Docs/Images/mydsn-trace.txt
+Docs/Images/mydsn.txt
+Docs/Images/myflowchart.txt
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index 98cbc838d31..9a2fde8fb89 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -354,7 +354,7 @@ static void usage(void)
puts("Description, check and repair of MyISAM tables.");
puts("Used without options all tables on the command will be checked for errors");
printf("Usage: %s [OPTIONS] tables[.MYI]\n", my_progname_short);
- puts("\nGlobal options:\n\
+ printf("\nGlobal options:\n\
-#, --debug=... Output debug log. Often this is 'd:t:o,filename'.\n\
-?, --help Display this help and exit.\n\
-O, --set-variable var=option.\n\
@@ -364,18 +364,18 @@ static void usage(void)
-t, --tmpdir=path Path for temporary files. Multiple paths can be\n\
specified, separated by ");
#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__)
- puts("semicolon (;)");
+ printf("semicolon (;)");
#else
- puts("colon (:)");
+ printf("colon (:)");
#endif
- puts(", they will be used\n\
+ printf(", they will be used\n\
in a round-robin fashion.\n\
-s, --silent Only print errors. One can use two -s to make\n\
myisamchk very silent.\n\
-v, --verbose Print more information. This can be used with\n\
--description and --check. Use many -v for more verbosity.\n\
-V, --version Print version and exit.\n\
- -w, --wait Wait if table is locked.\n");
+ -w, --wait Wait if table is locked.\n\n");
#ifdef DEBUG
puts(" --start-check-pos=# Start reading file at given offset.\n");
#endif