diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-09 19:16:15 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-09 19:16:15 -0600 |
| commit | 9a6a7bf5f694dae0b33e61301a17f7aa6fcd1b62 (patch) | |
| tree | ed06f905f1515a2117cc0c243c526264fccaac77 /myisam | |
| parent | 4bb40187438bdfb8b1d8b091399bd01e0e3425c1 (diff) | |
| parent | ebb3bd0f75ecb2b89e4fe07c693caa9e09c2ce3a (diff) | |
| download | mariadb-git-9a6a7bf5f694dae0b33e61301a17f7aa6fcd1b62.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
ltmain.sh:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/myisamchk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index bda1637314f..f650e4312f7 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -206,7 +206,7 @@ static struct option long_options[] = static void print_version(void) { - printf("%s Ver 1.48 for %s at %s\n",my_progname,SYSTEM_TYPE, + printf("%s Ver 1.49 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); } @@ -468,7 +468,7 @@ static void get_options(register int *argc,register char ***argv) if ((check_param.testflag & T_READONLY) && (check_param.testflag & (T_REP_BY_SORT | T_REP | T_STATISTICS | T_AUTO_INC | - T_SORT_RECORDS | T_SORT_INDEX))) + T_SORT_RECORDS | T_SORT_INDEX | T_FORCE_CREATE))) { VOID(fprintf(stderr, "%s: Can't use --readonly when repairing or sorting\n", |