diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-04-27 02:59:05 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-04-27 02:59:05 +0300 |
| commit | 45baf2b5d9799318a27fb7e2ab281c02339f6c1b (patch) | |
| tree | a2294940ed21a46a2e717e6757fbfbafdd8fde7e /sql/mysqld.cc | |
| parent | 79b88ac4f709fb62dec6c910aa237761943af15a (diff) | |
| parent | 194298265f726a153753c22dfe23b3add94e6a62 (diff) | |
| download | mariadb-git-45baf2b5d9799318a27fb7e2ab281c02339f6c1b.tar.gz | |
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e96870d4088..f1efe0330db 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5495,7 +5495,6 @@ The minimum value for this variable is 4096.", {"sync-frm", OPT_SYNC_FRM, "Sync .frm to disk on create. Enabled by default.", (gptr*) &opt_sync_frm, (gptr*) &opt_sync_frm, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, -#ifdef DOES_NOTHING_YET {"sync-replication", OPT_SYNC_REPLICATION, "Enable synchronous replication.", (gptr*) &global_system_variables.sync_replication, @@ -5511,7 +5510,6 @@ The minimum value for this variable is 4096.", (gptr*) &global_system_variables.sync_replication_timeout, (gptr*) &global_system_variables.sync_replication_timeout, 0, GET_ULONG, REQUIRED_ARG, 10, 0, ~0L, 0, 1, 0}, -#endif {"table_cache", OPT_TABLE_CACHE, "The number of open tables for all threads.", (gptr*) &table_cache_size, (gptr*) &table_cache_size, 0, GET_ULONG, REQUIRED_ARG, 64, 1, 512*1024L, |