diff options
| author | unknown <igor@rurik.mysql.com> | 2003-12-09 13:29:38 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-12-09 13:29:38 -0800 |
| commit | b6df8bb66ac8eefcbea86aecb0f8c067dcbe004c (patch) | |
| tree | 4fc50077940a0dabc39e9913665f20393df38b3f | |
| parent | 9388c419531adee2ce0ef0113f957dc013b81d49 (diff) | |
| download | mariadb-git-b6df8bb66ac8eefcbea86aecb0f8c067dcbe004c.tar.gz | |
key_cache.result, key_cache.test, mf_keycache.c:
Fixed a wrong return code by the function init_key_cache.
mysys/mf_keycache.c:
Fixed a wrong return code by the function init_key_cache.
mysql-test/t/key_cache.test:
Fixed a wrong return code by the function init_key_cache.
mysql-test/r/key_cache.result:
Fixed a wrong return code by the function init_key_cache.
| -rw-r--r-- | mysql-test/r/key_cache.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/key_cache.test | 6 | ||||
| -rw-r--r-- | mysys/mf_keycache.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result index 4bc4cad40a4..394099b363c 100644 --- a/mysql-test/r/key_cache.result +++ b/mysql-test/r/key_cache.result @@ -256,4 +256,6 @@ Table Op Msg_type Msg_text test.t1 assign_to_keycache status OK test.t2 assign_to_keycache status OK drop table t1,t2,t3; -set global keycache1.key_buffer_size=0; +set global keycache2.key_buffer_size=0; +set global keycache3.key_buffer_size=100; +set global keycache3.key_buffer_size=0; diff --git a/mysql-test/t/key_cache.test b/mysql-test/t/key_cache.test index a3b8bca847d..df16e11daae 100644 --- a/mysql-test/t/key_cache.test +++ b/mysql-test/t/key_cache.test @@ -135,4 +135,8 @@ drop table t1,t2,t3; # Cleanup # We don't reset keycache2 as we want to ensure that mysqld will reset it -set global keycache1.key_buffer_size=0; +set global keycache2.key_buffer_size=0; + +# Test to set up a too small size for a key cache (bug #2064) +set global keycache3.key_buffer_size=100; +set global keycache3.key_buffer_size=0; diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index f9b11e97f47..08737221fb2 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -391,7 +391,7 @@ int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size, } keycache->blocks= keycache->disk_blocks > 0 ? keycache->disk_blocks : 0; - DBUG_RETURN((int) blocks); + DBUG_RETURN((int) keycache->disk_blocks); err: error= my_errno; |