diff options
| author | unknown <ingo@mysql.com> | 2005-01-24 10:48:52 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-01-24 10:48:52 +0100 |
| commit | 0312a01721101217f29af12eba40ffde148ef8ee (patch) | |
| tree | 4a89fa584fd149ed4a310e3398a8cea3f47258db /sql/set_var.cc | |
| parent | 8d8e0cb539ff21509acc5e519a4e37eb29b9e380 (diff) | |
| parent | 7d358a015f0bd1cefdabce0ef796569239690053 (diff) | |
| download | mariadb-git-0312a01721101217f29af12eba40ffde148ef8ee.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
sql/set_var.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index bd4e496e082..6077d148ab3 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2234,7 +2234,7 @@ bool sys_var_key_buffer_size::update(THD *thd, set_var *var) if (!tmp) // Zero size means delete { - if (key_cache == sql_key_cache) + if (key_cache == dflt_key_cache) goto end; // Ignore default key cache if (key_cache->key_cache_inited) // If initied @@ -2248,7 +2248,7 @@ bool sys_var_key_buffer_size::update(THD *thd, set_var *var) base_name->length, &list); key_cache->in_init= 1; pthread_mutex_unlock(&LOCK_global_system_variables); - error= reassign_keycache_tables(thd, key_cache, sql_key_cache); + error= reassign_keycache_tables(thd, key_cache, dflt_key_cache); pthread_mutex_lock(&LOCK_global_system_variables); key_cache->in_init= 0; } |