diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-12-15 16:43:28 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-12-15 16:43:28 +0400 |
| commit | 7a99121b2cd93f60845a4c3db54dbb5c215a24b6 (patch) | |
| tree | c908a85395abf4745fb6ac0f3fc3518ccceca45b /sql/set_var.cc | |
| parent | dd3c7bbc1d0259a595207c2f92aa2bd33b231954 (diff) | |
| download | mariadb-git-7a99121b2cd93f60845a4c3db54dbb5c215a24b6.tar.gz | |
Fix trivial merge error
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 028339319af..e6c1bf94135 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -650,7 +650,8 @@ static sys_var_thd_enum sys_query_cache_type(&vars, "query_cache_type", static sys_var_thd_bool sys_query_cache_wlock_invalidate(&vars, "query_cache_wlock_invalidate", &SV::query_cache_wlock_invalidate); -static sys_var_bool_ptr sys_query_cache_strip_comments(&vars, "query_cache_strip_comments", &opt_query_cache_strip_comments); +static sys_var_bool_ptr sys_query_cache_strip_comments(&vars, "query_cache_strip_comments", + &opt_query_cache_strip_comments); #endif /* HAVE_QUERY_CACHE */ static sys_var_bool_ptr sys_secure_auth(&vars, "secure_auth", &opt_secure_auth); static sys_var_const_str_ptr sys_secure_file_priv(&vars, "secure_file_priv", @@ -940,8 +941,6 @@ static sys_var_const_str sys_hostname(&vars, "hostname", glob_hostname); static sys_var_const_str_ptr sys_log_basename(&vars, "log_basename", &opt_log_basename); -static sys_var_bool_ptr sys_query_cache_strip_comments(&vars, "query_cache_strip_comments", - &opt_query_cache_strip_comments); #ifndef EMBEDDED_LIBRARY static sys_var_const_str_ptr sys_repl_report_host(&vars, "report_host", &report_host); static sys_var_const_str_ptr sys_repl_report_user(&vars, "report_user", &report_user); |