diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-15 16:23:01 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-15 16:23:01 +0300 |
| commit | 17d526b73883294063961bc71a958c9a561cb97f (patch) | |
| tree | 38e01149b27f4d0b0b29f436336f67902beb68fa /sql/mysqld.cc | |
| parent | 314bf7c0a7f0f0572b507c7546e1cacd77960856 (diff) | |
| parent | 7a9ec9f97f017e39ee7e6dd28f0a6662abb87567 (diff) | |
| download | mariadb-git-17d526b73883294063961bc71a958c9a561cb97f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c4739a060e1..811984e50b4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3134,7 +3134,7 @@ extern "C" pthread_handler_decl(handle_connections_namedpipes,arg) ** handle start options ******************************************************************************/ -enum options { +enum options_mysqld { OPT_ISAM_LOG=256, OPT_SKIP_NEW, OPT_SKIP_GRANT, OPT_SKIP_LOCK, OPT_ENABLE_LOCK, OPT_USE_LOCKING, |