diff options
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a3b0123ee4a..b04d4e3cecd 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -382,7 +382,7 @@ my_bool opt_character_set_client_handshake= 1; bool server_id_supplied = 0; bool opt_endinfo, using_udf_functions; my_bool locked_in_memory; -bool opt_using_transactions, using_update_log; +bool opt_using_transactions; bool volatile abort_loop; bool volatile shutdown_in_progress; /** @@ -3815,12 +3815,6 @@ server."); { unireg_abort(1); } - - /* - Used to specify which type of lock we need to use for queries of type - INSERT ... SELECT. This will change when we have row level logging. - */ - using_update_log=1; } /* call ha_init_key_cache() on all key caches to init them */ @@ -7431,7 +7425,7 @@ static void mysql_init_variables(void) slave_open_temp_tables= 0; cached_thread_count= 0; opt_endinfo= using_udf_functions= 0; - opt_using_transactions= using_update_log= 0; + opt_using_transactions= 0; abort_loop= select_thread_in_use= signal_thread_in_use= 0; ready_to_exit= shutdown_in_progress= grant_option= 0; aborted_threads= aborted_connects= 0; |