diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-17 19:04:33 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-17 19:04:33 +0200 |
| commit | a33af54d8ef84a7d0cad3cc88b87633c8ef76065 (patch) | |
| tree | a90993e8e601e10bc825a635e85bda9a1d5ee5bd /myisam | |
| parent | c3582cae97e51c5c63b9a873d543fcd5c0e120f0 (diff) | |
| download | mariadb-git-a33af54d8ef84a7d0cad3cc88b87633c8ef76065.tar.gz | |
Write UNION() for MERGE tables
Docs/manual.texi:
Clearify when logging is done
myisam/myisamchk.c:
Better error message
mysql-test/r/merge.result:
Added test for SHOW CREATE on MERGE table
scripts/safe_mysqld.sh:
Search by default in database directory
sql/ha_myisammrg.h:
Add UNION() to SHOW CREATE TABLE
sql/sql_update.cc:
removed compiler warning
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/myisamchk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 0e57c793dae..66a059c0f20 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -860,7 +860,7 @@ end2: filename)); if (check_param.testflag & (T_REP_BY_SORT | T_REP)) VOID(fprintf(stderr, - "Try fixing it by using the --safe-recover (-o) option\n")); + "Try fixing it by using the --safe-recover (-o) or the --force (-f) option\n")); } else if (!(param->error_printed & 2) && !(param->testflag & T_FORCE_CREATE)) |