database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-16 22:27:52 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files

42
sql/sql_class.h
View File

@@ -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;