diff options
author | Konstantin Osipov <kostja@sun.com> | 2009-10-16 16:53:45 +0400 |
---|---|---|
committer | Konstantin Osipov <kostja@sun.com> | 2009-10-16 16:53:45 +0400 |
commit | 9a2d366608d9ba41f0b52b4fe68b2ca913648409 (patch) | |
tree | 4a7bfd0c169379e969471f2dc7b61e95db4b7ee6 | |
parent | 4eec84dff55427bb2bc839a94e9b9894722c7c0e (diff) | |
parent | 38b403bae322fee3dadedb1cffaff13e6c1e724c (diff) | |
download | mariadb-git-9a2d366608d9ba41f0b52b4fe68b2ca913648409.tar.gz |
Merge with next-mr-runtime
-rw-r--r-- | sql/sql_cache.cc | 8 | ||||
-rw-r--r-- | sql/sql_class.h | 42 |
2 files changed, 25 insertions, 25 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 1252d32ef99..fc853af65a8 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -2114,10 +2114,10 @@ ulong Query_cache::init_cache() file system) and so should use case insensitive collation for comparison. */ - VOID(hash_init(&tables, - lower_case_table_names ? &my_charset_bin : - files_charset_info, - def_table_hash_size, 0, 0,query_cache_table_get_key, 0, 0)); + VOID(my_hash_init(&tables, + lower_case_table_names ? &my_charset_bin : + files_charset_info, + def_table_hash_size, 0, 0,query_cache_table_get_key, 0, 0)); #endif queries_in_cache = 0; diff --git a/sql/sql_class.h b/sql/sql_class.h index cd063b1db3a..558de19b7af 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -280,6 +280,27 @@ public: LEX_COLUMN (const String& x,const uint& y ): column (x),rights (y) {} }; +/** + Query_cache_tls -- query cache thread local data. +*/ + +struct Query_cache_block; + +struct Query_cache_tls +{ + /* + 'first_query_block' should be accessed only via query cache + functions and methods to maintain proper locking. + */ + Query_cache_block *first_query_block; + void set_first_query_block(Query_cache_block *first_query_block_arg) + { + first_query_block= first_query_block_arg; + } + + Query_cache_tls() :first_query_block(NULL) {} +}; + /* SIGNAL / RESIGNAL / GET DIAGNOSTICS */ /** @@ -315,27 +336,6 @@ typedef enum enum_diag_condition_item_name */ extern const LEX_STRING Diag_condition_item_names[]; -/** - Query_cache_tls -- query cache thread local data. -*/ - -class Query_cache_block; - -struct Query_cache_tls -{ - /* - 'first_query_block' should be accessed only via query cache - functions and methods to maintain proper locking. - */ - Query_cache_block *first_query_block; - void set_first_query_block(Query_cache_block *first_query_block_arg) - { - first_query_block= first_query_block_arg; - } - - Query_cache_tls() :first_query_block(NULL) {} -}; - #include "sql_lex.h" /* Must be here */ class Delayed_insert; |