1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

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
This commit is contained in:
unknown
2003-10-01 23:37:05 -07:00
parent 09e7be1d82
commit 06ecf87e15
7 changed files with 28 additions and 19 deletions

View File

@@ -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;