diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
| commit | ae64b6f7ab2ba58fd79ca8d808839ee41bf99f23 (patch) | |
| tree | 1f14300a8f95891aff71bf267d5b096d3f8b1ff6 /sql/mysqld.cc | |
| parent | aeeafbb39656fc4678c72b00f958215754b32dc7 (diff) | |
| parent | 7b3b8ae154da00cb35c067db62a2df57f0ea978f (diff) | |
| download | mariadb-git-ae64b6f7ab2ba58fd79ca8d808839ee41bf99f23.tar.gz | |
merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index afc515a9d8c..eaa3e27cf29 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -439,10 +439,10 @@ static bool calling_initgroups= FALSE; /**< Used in SIGSEGV handler. */ #endif uint mysqld_port, test_flags, select_errors, dropping_tables, ha_open_options; uint mysqld_port_timeout; -uint delay_key_write_options; +ulong delay_key_write_options; uint protocol_version; uint lower_case_table_names; -uint tc_heuristic_recover= 0; +ulong tc_heuristic_recover= 0; uint volatile thread_count; int32 thread_running; ulong thread_created; @@ -453,7 +453,7 @@ ulong slow_launch_time, slave_open_temp_tables; ulong open_files_limit, max_binlog_size, max_relay_log_size; ulong slave_trans_retries; uint slave_net_timeout; -uint slave_exec_mode_options; +ulong slave_exec_mode_options; ulonglong slave_type_conversions_options; ulong thread_cache_size=0, thread_pool_size= 0; ulong binlog_cache_size=0; @@ -552,7 +552,7 @@ char *mysql_data_home= const_cast<char*>("."); const char *mysql_real_data_home_ptr= mysql_real_data_home; char server_version[SERVER_VERSION_LENGTH]; char *mysqld_unix_port, *opt_mysql_tmpdir; -uint thread_handling; +ulong thread_handling; /** name of reference on left expression in rewritten IN subquery */ const char *in_left_expr_name= "<left expr>"; |