diff options
| -rw-r--r-- | sql/mysql_priv.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 4d819ef6ae7..d89816a0dd9 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -708,6 +708,8 @@ extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types; extern my_bool opt_safe_show_db, opt_local_infile, lower_case_table_names; extern my_bool opt_slave_compressed_protocol, use_temp_pool; extern my_bool opt_enable_named_pipe; +extern char *shared_memory_base_name; +extern bool opt_enable_shared_memory; extern char f_fyllchar; extern MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b607bcdb3a1..01dadbb6223 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -345,8 +345,8 @@ arg_cmp_func Arg_comparator::comparator_matrix[4][2] = {&Arg_comparator::compare_int, &Arg_comparator::compare_e_int}, {&Arg_comparator::compare_row, &Arg_comparator::compare_e_row}}; #ifdef HAVE_SMEM -static char *shared_memory_base_name=default_shared_memory_base_name; -static bool opt_enable_shared_memory = 0; +char *shared_memory_base_name=default_shared_memory_base_name; +bool opt_enable_shared_memory = 0; #endif volatile ulong cached_thread_count=0; |