summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-10-16 03:08:40 +0300
committermonty@mashka.mysql.fi <>2003-10-16 03:08:40 +0300
commite87c9f5ff8e94ababbed0161101cfd3616d20422 (patch)
treebd2eb4ac5dffdd3ac1af40b53a3680a0a9d78195 /myisam
parent0d34e50f39e1b7cb14170dabc08f7823cb50a2e9 (diff)
parent4d45ad98b966cf26b8aaf888deed7d1c4c61fc84 (diff)
downloadmariadb-git-e87c9f5ff8e94ababbed0161101cfd3616d20422.tar.gz
merge with 4.0
Diffstat (limited to 'myisam')
-rw-r--r--myisam/myisamchk.c2
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,