Fix trivial merge error

7a99121b · Sergey Petrunya · dd3c7bbc · 7a99121b
Commit 7a99121b authored Dec 15, 2011 by Sergey Petrunya
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

sql/set_var.cc sql/set_var.cc +2 -3

No files found.
--- 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);