summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-11-10 15:09:44 +0100
committerMikael Ronstrom <mikael@mysql.com>2009-11-10 15:09:44 +0100
commit58494ba0dfb4fad76deb712383f71c684bb97091 (patch)
tree7052c4524deb8d643a368cfe0e2fa21f519665b2 /sql/sql_base.cc
parentd3540b216f2d39126d77985db3f7639eb45bf967 (diff)
downloadmariadb-git-58494ba0dfb4fad76deb712383f71c684bb97091.tar.gz
Review comments for LOCK_open patch
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 064d277e0b4..9116d89ceed 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2513,7 +2513,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;
- uint hash_value;
+ my_hash_value_type hash_value;
HASH_SEARCH_STATE state;
DBUG_ENTER("open_table");
@@ -2746,11 +2746,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*) hash_first_from_hash_value(&open_cache,
- hash_value,
- (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*) hash_next(&open_cache, (uchar*) key, key_length,
&state))