1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a windows build failure (next-mr-runtime).

Browse Source 
sql/sql_cache.cc:
  Use my_hash_init() on Windows as well.
sql/sql_class.h:
  Use struct Query_cache_block (not class) for forward declaration,
  realing the code to match 6.0 alignment.
This commit is contained in:
Konstantin Osipov 2009-10-16 15:39:57 +04:00
parent 3b3955be5a
commit 38b403bae3
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_cache.cc
View File

@ -2114,10 +2114,10 @@ ulong Query_cache::init_cache()
file system) and so should use case insensitive collation for file system) and so should use case insensitive collation for
comparison. comparison.
*/ */
VOID(hash_init(&tables, VOID(my_hash_init(&tables,
lower_case_table_names ? &my_charset_bin : lower_case_table_names ? &my_charset_bin :
files_charset_info, files_charset_info,
def_table_hash_size, 0, 0,query_cache_table_get_key, 0, 0)); def_table_hash_size, 0, 0,query_cache_table_get_key, 0, 0));
#endif #endif
queries_in_cache = 0; queries_in_cache = 0;

42
sql/sql_class.h
View File

@ -280,6 +280,27 @@ public:
LEX_COLUMN (const String& x,const uint& y ): column (x),rights (y) {} 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 */ /* SIGNAL / RESIGNAL / GET DIAGNOSTICS */
/** /**
@ -315,27 +336,6 @@ typedef enum enum_diag_condition_item_name
*/ */
extern const LEX_STRING Diag_condition_item_names[]; 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 */ #include "sql_lex.h" /* Must be here */
class Delayed_insert; class Delayed_insert;