diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-10-13 22:18:48 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-10-13 22:18:48 +0400 |
| commit | 99420dd913333cf7bb109e9c5d71d2daf66e3dca (patch) | |
| tree | dbed8bfecfa79c568812273856637bd355bb78eb /include | |
| parent | 9a65687bd9e76783d3e34cb35b5c8cc05421134d (diff) | |
| download | mariadb-git-99420dd913333cf7bb109e9c5d71d2daf66e3dca.tar.gz | |
Introduce thd->query_cache_tls (thread
local storage for query cache).
We need more than one pointer in a thread to
represent the query cache and net->query_cache_query can not be used
any more (due to ABI compatibility issues and to different life
time of NET and THD).
This is a backport of the following patch from 6.0:
----------------------------------------------------------
revno: 2476.1157.2
committer: kostja@bodhi.(none)
timestamp: Sat 2007-06-16 13:29:24 +0400
include/mysql.h.pp:
Update the ABI (NET::query_cache_query is now unused).
include/mysql_com.h:
NET::query_cache_query is now unused.
sql/mysql_priv.h:
Update signatures of ex-functios now member functions.
sql/sql_cache.cc:
Introduce THD::query_cache_tls.
sql/sql_cache.h:
Introduce THD::query_cache_tls.
sql/sql_class.cc:
Introduce THD::query_cache_tls.
sql/sql_class.h:
Introduce THD::query_cache_tls.
sql/sql_parse.cc:
Use THD::query_cache_tls.
sql/sql_select.cc:
Use THD::query_cache_tls.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h.pp | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index fcbcea61873..3d1304bf460 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -32,7 +32,7 @@ typedef struct st_net { my_bool unused2; my_bool compress; my_bool unused3; - unsigned char *query_cache_query; + unsigned char *unused; unsigned int last_errno; unsigned char error; my_bool unused4; diff --git a/include/mysql_com.h b/include/mysql_com.h index 672c359a6f7..5e1b6b8504a 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -264,10 +264,9 @@ typedef struct st_net { */ #endif /* - 'query_cache_query' should be accessed only via query cache - functions and methods to maintain proper locking. + Unused, please remove with the next incompatible ABI change. */ - unsigned char *query_cache_query; + unsigned char *unused; unsigned int last_errno; unsigned char error; my_bool unused4; /* Please remove with the next incompatible ABI change. */ |