database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge WL#5137 to mysql-next-mr

Browse Source
This commit is contained in:
Mikael Ronstrom
2009-11-27 17:16:58 +01:00
parent 3c11750e36 dd31eaa550
commit 4d58e7717e
3 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_base.cc
View File

@ -2551,6 +2551,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
char key[MAX_DBKEY_LENGTH];
uint key_length;
char *alias= table_list->alias;
my_hash_value_type hash_value;
HASH_SEARCH_STATE state;
DBUG_ENTER("open_table");
@ -2740,6 +2741,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
on disk.
*/
hash_value= my_calc_hash(&open_cache, (uchar*) key, key_length);
pthread_mutex_lock(&LOCK_open);
/*
@ -2782,8 +2784,11 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
an implicit "pending locks queue" - see
wait_for_locked_table_names for details.
*/
for (table= (TABLE*) my_hash_first(&open_cache, (uchar*) key, key_length,
&state);
for (table= (TABLE*) my_hash_first_from_hash_value(&open_cache,
hash_value,
(uchar*) key,
key_length,
&state);
table && table->in_use ;
table= (TABLE*) my_hash_next(&open_cache, (uchar*) key, key_length,
&state))