diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-08-12 14:17:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-08-12 14:17:51 +0200 |
| commit | eafb11c821dedf5fb5509875b4fb553417ef1ea5 (patch) | |
| tree | 5263e3bcc243c88a8dc89bd3c471496a6d7b353b /sql/sql_cache.cc | |
| parent | 055e9cb49c18460efcb0bba83f5e4da63ede0cdc (diff) | |
| download | mariadb-git-eafb11c821dedf5fb5509875b4fb553417ef1ea5.tar.gz | |
MDEV-4786 merge 10.0-monty -> 10.0
use get_table_def_key() instead of create_table_def_key() where appropriate
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 007a1b3b585..d70113c28e4 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -3204,11 +3204,9 @@ void Query_cache::invalidate_table(THD *thd, TABLE_LIST *table_list) invalidate_table(thd, table_list->table); // Table is open else { - char key[MAX_DBKEY_LENGTH]; + const char *key; uint key_length; - - key_length= create_table_def_key(key, table_list->db, - table_list->table_name); + key_length= get_table_def_key(table_list, &key); // We don't store temporary tables => no key_length+=4 ... invalidate_table(thd, (uchar *)key, key_length); @@ -3321,13 +3319,12 @@ Query_cache::register_tables_from_list(THD *thd, TABLE_LIST *tables_used, (*block_table)->n= n; if (tables_used->view) { - char key[MAX_DBKEY_LENGTH]; + const char *key; uint key_length; DBUG_PRINT("qcache", ("view: %s db: %s", tables_used->view_name.str, tables_used->view_db.str)); - key_length= create_table_def_key(key, tables_used->view_db.str, - tables_used->view_name.str); + key_length= get_table_def_key(tables_used, &key); /* There are not callback function for for VIEWs */ @@ -3416,7 +3413,7 @@ my_bool Query_cache::register_all_tables(THD *thd, */ my_bool -Query_cache::insert_table(uint key_len, char *key, +Query_cache::insert_table(uint key_len, const char *key, Query_cache_block_table *node, uint32 db_length, uint8 suffix_length_arg, uint8 cache_type, |