From 2ccf247e939b39d1f84908a56b8717150e5fd1b4 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 12 Dec 2011 23:58:40 +0100 Subject: after merge changes: * rename all debugging related command-line options and variables to start from "debug-", and made them all OFF by default. * replace "MySQL" with "MariaDB" in error messages * "Cast ... converted ... integer to it's ... complement" is now a note, not a warning * @@query_cache_strip_comments now has a session scope, not global. --- sql/sql_cache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_cache.cc') diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index e3c9ecc1a36..6bc1d5204b6 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1770,7 +1770,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length) goto err_unlock; Query_cache_block *query_block; - if (opt_query_cache_strip_comments) + if (thd->variables.query_cache_strip_comments) { make_base_query(&thd->base_query, sql, (size_t) (sql_end - sql), thd->db_length + 1 + QUERY_CACHE_FLAGS_SIZE); -- cgit v1.2.1