merge

735cdd63 · Mattias Jonsson · 3227d625 · f9015023 · 735cdd63 · 735cdd63
Commit 735cdd63 authored Dec 16, 2009 by Mattias Jonsson
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

mysql-test/r/partition_key_cache.result mysql-test/r/partition_key_cache.result +0 -3

mysql-test/t/partition_key_cache.test mysql-test/t/partition_key_cache.test +0 -1

No files found.
--- a/mysql-test/r/partition_key_cache.result
+++ b/mysql-test/r/partition_key_cache.result
@@ -8,9 +8,6 @@ SELECT @org_key_cache_buffer_size:= @@global.default.key_buffer_size;
 SET @@global.default.key_buffer_size = 1;
 Warnings:
 Warning	1292	Truncated incorrect key_buffer_size value: '1'
-SELECT @@global.default.key_buffer_size;
-@@global.default.key_buffer_size
-36
 CREATE TABLE t1 (
 a INT,
 b INT,

--- a/mysql-test/t/partition_key_cache.test
+++ b/mysql-test/t/partition_key_cache.test
@@ -10,7 +10,6 @@ DROP TABLE IF EXISTS t1, t2, v, x;
 SELECT @org_key_cache_buffer_size:= @@global.default.key_buffer_size;
 --echo # Minimize default key cache (almost disabled).
 SET @@global.default.key_buffer_size = 1;
-SELECT @@global.default.key_buffer_size;
 CREATE TABLE t1 (
  a INT,
  b INT,