mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
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.
This commit is contained in:
@@ -40,7 +40,7 @@
|
|||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <violite.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 */
|
/* Don't try to make a nice table if the data is too big */
|
||||||
#define MAX_COLUMN_LENGTH 1024
|
#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.",
|
{"safe-updates", 'U', "Only allow UPDATE and DELETE that uses keys.",
|
||||||
(gptr*) &safe_updates, (gptr*) &safe_updates, 0, GET_BOOL, OPT_ARG, 0, 0,
|
(gptr*) &safe_updates, (gptr*) &safe_updates, 0, GET_BOOL, OPT_ARG, 0, 0,
|
||||||
0, 0, 0, 0},
|
0, 0, 0, 0},
|
||||||
{"i-am-a-dummy", 'U', "Synonym for option --safe-updates, -U.", 0, 0, 0,
|
{"i-am-a-dummy", 'U', "Synonym for option --safe-updates, -U.",
|
||||||
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
(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,
|
{"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},
|
0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
||||||
{"version", 'V', "Output version information and exit.", 0, 0, 0,
|
{"version", 'V', "Output version information and exit.", 0, 0, 0,
|
||||||
|
@@ -269,7 +269,7 @@ static struct my_option my_long_options[] =
|
|||||||
|
|
||||||
static void print_version(void)
|
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)
|
static void usage(void)
|
||||||
@@ -282,7 +282,7 @@ static void usage(void)
|
|||||||
puts("Pack a MyISAM-table to take much less space.");
|
puts("Pack a MyISAM-table to take much less space.");
|
||||||
puts("Keys are not updated, you must run myisamchk -rq on the datafile");
|
puts("Keys are not updated, you must run myisamchk -rq on the datafile");
|
||||||
puts("afterwards to update the keys.");
|
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);
|
printf("\nUsage: %s [OPTIONS] filename...\n", my_progname);
|
||||||
my_print_help(my_long_options);
|
my_print_help(my_long_options);
|
||||||
|
Reference in New Issue
Block a user