summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jani@rhols221.adsl.netsonic.fi>2002-10-04 17:18:41 +0300
committerunknown <jani@rhols221.adsl.netsonic.fi>2002-10-04 17:18:41 +0300
commitb6e1ae891c4d216348eddf50051a9dcf1f2a1dee (patch)
tree111dd00bf0fe093af1c8189121d831f38d898151
parent04913b565a6d8783638d2beac137c1865ed0411c (diff)
downloadmariadb-git-b6e1ae891c4d216348eddf50051a9dcf1f2a1dee.tar.gz
Small fixes in mysql and myisampack
client/mysql.cc: Made i-am-a-dummy option to be identical with safe-updates. myisam/myisampack.c: Fixed a typo.
-rw-r--r--client/mysql.cc7
-rw-r--r--myisam/myisampack.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 33e72946cda..70b5561a7ea 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -40,7 +40,7 @@
#include <signal.h>
#include <violite.h>
-const char *VER= "12.14";
+const char *VER= "12.15";
/* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024
@@ -556,8 +556,9 @@ static struct my_option my_long_options[] =
{"safe-updates", 'U', "Only allow UPDATE and DELETE that uses keys.",
(gptr*) &safe_updates, (gptr*) &safe_updates, 0, GET_BOOL, OPT_ARG, 0, 0,
0, 0, 0, 0},
- {"i-am-a-dummy", 'U', "Synonym for option --safe-updates, -U.", 0, 0, 0,
- GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+ {"i-am-a-dummy", 'U', "Synonym for option --safe-updates, -U.",
+ (gptr*) &safe_updates, (gptr*) &safe_updates, 0, GET_BOOL, OPT_ARG, 0, 0,
+ 0, 0, 0, 0},
{"verbose", 'v', "Write more. (-v -v -v gives the table output format)", 0,
0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Output version information and exit.", 0, 0, 0,
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index cf0448a9062..4fc84ac5657 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -269,7 +269,7 @@ static struct my_option my_long_options[] =
static void print_version(void)
{
- printf("%s Ver 1.21 for %s on %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
+ printf("%s Ver 1.22 for %s on %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
}
static void usage(void)
@@ -282,7 +282,7 @@ static void usage(void)
puts("Pack a MyISAM-table to take much less space.");
puts("Keys are not updated, you must run myisamchk -rq on the datafile");
puts("afterwards to update the keys.");
- puts("You should give the .MSI file as the filename argument.");
+ puts("You should give the .MYI file as the filename argument.");
printf("\nUsage: %s [OPTIONS] filename...\n", my_progname);
my_print_help(my_long_options);