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.

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;

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;

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;