diff options
| author | unknown <igor@rurik.mysql.com> | 2003-10-01 23:37:05 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-10-01 23:37:05 -0700 |
| commit | 06ecf87e15d8e8d7ae24aa23ccead4a2c4bbc78e (patch) | |
| tree | b01319a4b1ce6d72b1867800eec320e03d3a9acd /sql/sql_base.cc | |
| parent | 09e7be1d821831eee3bdeb0126a92aa7c23bed7d (diff) | |
| download | mariadb-git-06ecf87e15d8e8d7ae24aa23ccead4a2c4bbc78e.tar.gz | |
Many files:
Fix after manual merge
mysql-test/r/range.result:
Fix after manual merge
sql/handler.cc:
Fix after manual merge
sql/mysql_priv.h:
Fix after manual merge
sql/opt_range.cc:
Fix after manual merge
sql/set_var.cc:
Fix after manual merge
sql/sql_base.cc:
Fix after manual merge
sql/sql_parse.cc:
Fix after manual merge
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 537368943db..2a9262e2646 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -867,7 +867,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name, } key_cache_asmt->key_length= key_length; key_cache_asmt->key_cache= &dflt_key_cache_var; - VOID(hash_insert(&assign_cache, (byte *) key_cache_asmt)); + VOID(my_hash_insert(&assign_cache, (byte *) key_cache_asmt)); key_cache_asmt->requests++; } key_cache_asmt->to_reassign= 0; |