1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +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

@@ -1135,7 +1135,8 @@ int ha_key_cache(KEY_CACHE_VAR *key_cache)
return 0;
}
int ha_resize_key_cache(KEY_CACHE_VAR *key_cache)
{
if (key_cache->cache)
{
pthread_mutex_lock(&LOCK_global_system_variables);