From 7da08881a34b9c04dda6c0559742f360a5306224 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 30 Oct 2003 01:01:53 +0200 Subject: Change back service name to MySQL Don't add service name to read config file segments if it's "MySQL" Fixed possible memory leak when CHANGE USER failed. include/mysql_com.h: Change back service name to MySQL (With new, better spelling) myisam/myisamchk.c: Improved --help sql/mysqld.cc: Don't add service name to read config file segments if it's "MySQL" sql/sql_parse.cc: Fixed possible memory leak when CHANGE USER failed. --- myisam/myisamchk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'myisam/myisamchk.c') diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index b7627fc59fd..f1deda41f8b 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -401,7 +401,9 @@ static void usage(void) Change the character set used by the index\n\ -q, --quick Faster repair by not modifying the data file.\n\ One can give a second '-q' to force myisamchk to\n\ - modify the original datafile in case of duplicate keys\n\ + modify the original datafile in case of duplicate keys.\n\ + NOTE: Tables where the data file is currupted can't be\n\ + fixed with this option.\n\ -u, --unpack Unpack file packed with myisampack.\n\ "); @@ -1094,7 +1096,7 @@ end2: filename)); if (param->testflag & T_REP_ANY) VOID(fprintf(stderr, - "Try fixing it by using the --safe-recover (-o) or the --force (-f) option\n")); + "Try fixing it by using the --safe-recover (-o), the --force (-f) option or by not using the --quick (-q) flag\n")); } else if (!(param->error_printed & 2) && !(param->testflag & T_FORCE_CREATE)) -- cgit v1.2.1