diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-16 03:08:40 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-16 03:08:40 +0300 |
| commit | aff45e1b0733947abde48f712c1af64b4f2549a7 (patch) | |
| tree | bd2eb4ac5dffdd3ac1af40b53a3680a0a9d78195 /myisam | |
| parent | 893797be02d4dff2e1aafbdb98ac4e33b9726628 (diff) | |
| parent | 0fc97bc9e5c6c0a4f380841b325f6f0647a90bb5 (diff) | |
| download | mariadb-git-aff45e1b0733947abde48f712c1af64b4f2549a7.tar.gz | |
merge with 4.0
BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
Auto merged
client/client_priv.h:
Auto merged
extra/resolveip.c:
Auto merged
include/mysql.h:
Auto merged
include/thr_alarm.h:
Auto merged
myisam/myisamchk.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_test.cc:
Auto merged
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 b2fdb2ccf3f..76d3205dc01 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -146,7 +146,7 @@ int main(int argc, char **argv) #endif } /* main */ -enum options { +enum options_mc { OPT_CHARSETS_DIR=256, OPT_SET_CHARSET,OPT_START_CHECK_POS, OPT_CORRECT_CHECKSUM, OPT_KEY_BUFFER_SIZE, OPT_MYISAM_BLOCK_SIZE, OPT_READ_BUFFER_SIZE, OPT_WRITE_BUFFER_SIZE, OPT_SORT_BUFFER_SIZE, |