diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
| commit | 2ccf247e939b39d1f84908a56b8717150e5fd1b4 (patch) | |
| tree | c0a9a318a055f87e13206656d7765f96d3293d9f /sql/sql_cache.cc | |
| parent | 6cc9d0ffa0b6d9d0f19cf9445fad0e0ba11e38f8 (diff) | |
| download | mariadb-git-2ccf247e939b39d1f84908a56b8717150e5fd1b4.tar.gz | |
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.
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); |