diff options
| author | unknown <serg@serg.mylan> | 2003-10-06 09:24:12 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-06 09:24:12 +0200 |
| commit | 08504cfe276a2ff53ab34a13250220c28702e03c (patch) | |
| tree | de0da0e25a789198ff97b62cfa201858bbf38a10 /myisam | |
| parent | b2fd8218168925cec6c623e855fc3c1d58df5ce9 (diff) | |
| parent | 907e0555834de14fa1aec538b217dd1f1c3ff23f (diff) | |
| download | mariadb-git-08504cfe276a2ff53ab34a13250220c28702e03c.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
scripts/mysql_config.sh:
Auto merged
sql/mysqld.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 83edadf153f..b7627fc59fd 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -144,7 +144,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, |