diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-04-03 13:19:35 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-04-03 13:19:35 -0700 |
| commit | 32a4805c5cf2b1bf8aee3e59abfe8aa3b9ad90b6 (patch) | |
| tree | 31281669a3f273880b36158b9037ad05008f3661 /sql/mysqld.cc | |
| parent | 59baf97d56ab2a06fd6cde5509ba933c102fb203 (diff) | |
| parent | 9560ff99c95f680b4c58595bc6b1aeb631128815 (diff) | |
| download | mariadb-git-32a4805c5cf2b1bf8aee3e59abfe8aa3b9ad90b6.tar.gz | |
Merge with the latest changes of 5.2
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 712c84e300f..f6bad3cf337 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6646,8 +6646,6 @@ Can't be set to 1 if --log-slave-updates is used.", {"shared-memory", OPT_ENABLE_SHARED_MEMORY, "Enable the shared memory.",(uchar**) &opt_enable_shared_memory, (uchar**) &opt_enable_shared_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, -#endif -#ifdef HAVE_SMEM {"shared-memory-base-name",OPT_SHARED_MEMORY_BASE_NAME, "Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -8378,6 +8376,8 @@ mysqld_get_one_option(int optid, case (int) OPT_INIT_RPL_ROLE: { int role; + LINT_INIT(role); + if (!find_opt_type(argument, &rpl_role_typelib, opt->name, &role)) { rpl_status = (role == 1) ? RPL_AUTH_MASTER : RPL_IDLE_SLAVE; @@ -8434,6 +8434,8 @@ mysqld_get_one_option(int optid, case OPT_BINLOG_FORMAT: { int id; + LINT_INIT(id); + if (!find_opt_type(argument, &binlog_format_typelib, opt->name, &id)) { global_system_variables.binlog_format= opt_binlog_format_id= id - 1; @@ -8684,6 +8686,8 @@ mysqld_get_one_option(int optid, else { int type; + LINT_INIT(type); + if (!find_opt_type(argument, &delay_key_write_typelib, opt->name, &type)) delay_key_write_options= (uint) type-1; } @@ -8695,6 +8699,8 @@ mysqld_get_one_option(int optid, case OPT_TX_ISOLATION: { int type; + LINT_INIT(type); + if (!find_opt_type(argument, &tx_isolation_typelib, opt->name, &type)) global_system_variables.tx_isolation= (type-1); break; @@ -8782,6 +8788,7 @@ mysqld_get_one_option(int optid, ulong method_conv; int method; LINT_INIT(method_conv); + LINT_INIT(method); myisam_stats_method_str= argument; if (!find_opt_type(argument, &myisam_stats_method_typelib, @@ -8844,6 +8851,7 @@ mysqld_get_one_option(int optid, case OPT_THREAD_HANDLING: { int id; + LINT_INIT(id); if (!find_opt_type(argument, &thread_handling_typelib, opt->name, &id)) global_system_variables.thread_handling= id - 1; opt_thread_handling= thread_handling_typelib.type_names[global_system_variables.thread_handling]; |