summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-12-13 20:07:23 +0200
committerMichael Widenius <monty@askmonty.org>2011-12-13 20:07:23 +0200
commit43c8a6ac19c48dad77aae7deb4eb0ef22a5b0ba7 (patch)
treeb2c90f5f9b8e4087d36118c16291eedb752defe4 /sql/set_var.cc
parent76d852d42549a450c72747b1cea1be1283a58bb7 (diff)
downloadmariadb-git-43c8a6ac19c48dad77aae7deb4eb0ef22a5b0ba7.tar.gz
Fixed failure with query_cache.test for embedded server
sql/set_var.cc: Moved query_cache_strip_comments from EMBEDDED_LIBRARY to HAVE_QUERY_CACHE
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 926ae4696b8..01223eaaf57 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -650,6 +650,7 @@ 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);
#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",
@@ -942,8 +943,6 @@ static sys_var_const_str_ptr sys_log_basename(&vars, "log_basename",
#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);
-static sys_var_bool_ptr sys_query_cache_strip_comments(&vars, "query_cache_strip_comments",
- &opt_query_cache_strip_comments);
static sys_var_const_str_ptr sys_repl_report_password(&vars, "report_password", &report_password);
static uchar *slave_get_report_port(THD *thd)