Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1

into rurik.mysql.com:/home/igor/mysql-4.1

2 files changed, 40 insertions, 88 deletions

diff --git a/mysql-test/r/preload.result b/mysql-test/r/preload.result
index 0afd95b6fb8..4d9293c7929 100644
--- a/mysql-test/r/preload.result
+++ b/mysql-test/r/preload.result
@@ -46,169 +46,122 @@ count(*)
 20672
 flush tables;
 flush status;
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	217
 Key_reads	45
-Key_write_requests	0
-Key_writes	0
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	434
 Key_reads	45
-Key_write_requests	0
-Key_writes	0
 flush tables;
 flush status;
 select @@preload_buffer_size;
 @@preload_buffer_size
 32768
-preload t1 keys;
+load index into cache t1 keys;
 Table	Op	Msg_type	Msg_text
 test.t1	preload_keys	status	OK
-show status like "preload_%";
+show status like "key_read%";
 Variable_name	Value
-show status like "key_%";
-Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	217
 Key_reads	45
-Key_write_requests	0
-Key_writes	0
 flush tables;
 flush status;
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
 set session preload_buffer_size=256*1024;
 select @@preload_buffer_size;
 @@preload_buffer_size
 262144
-preload t1 keys ignore leaves;
+load index into cache t1 keys ignore leaves;
 Table	Op	Msg_type	Msg_text
 test.t1	preload_keys	status	OK
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	217
 Key_reads	45
-Key_write_requests	0
-Key_writes	0
 flush tables;
 flush status;
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
 set session preload_buffer_size=1*1024;
 select @@preload_buffer_size;
 @@preload_buffer_size
 1024
-preload t1 keys, t2 keys (primary,b) ignore leaves;
+load index into cache t1 keys, t2 keys (primary,b) ignore leaves;
 Table	Op	Msg_type	Msg_text
 test.t1	preload_keys	status	OK
 test.t2	preload_keys	status	OK
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
 select count(*) from t1 where b = 'test1';
 count(*)
 4181
 select count(*) from t2 where b = 'test1';
 count(*)
 2584
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	351
 Key_reads	73
-Key_write_requests	0
-Key_writes	0
 flush tables;
 flush status;
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
-preload t3 keys, t2 keys (primary,b) ;
+load index into cache t3 keys, t2 keys (primary,b) ;
 Table	Op	Msg_type	Msg_text
 test.t3	preload_keys	error	Table 'test.t3' doesn't exist
 test.t2	preload_keys	status	OK
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
 flush tables;
 flush status;
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
-preload t3 keys (b), t2 keys (c) ;
+load index into cache t3 keys (b), t2 keys (c) ;
 Table	Op	Msg_type	Msg_text
 test.t3	preload_keys	error	Table 'test.t3' doesn't exist
 test.t2	preload_keys	error	Key column 'c' doesn't exist in table
 test.t2	preload_keys	status	Operation failed
-show status like "key_%";
+show status like "key_read%";
 Variable_name	Value
-Key_blocks_used	918
 Key_read_requests	0
 Key_reads	0
-Key_write_requests	0
-Key_writes	0
 drop table t1, t2;
diff --git a/mysql-test/t/preload.test b/mysql-test/t/preload.test
index 1fd0d0a5b17..7357b42c599 100755
--- a/mysql-test/t/preload.test
+++ b/mysql-test/t/preload.test
@@ -54,48 +54,47 @@ select count(*) from t1;
 select count(*) from t2;
 
 flush tables; flush status;
-show status like "key_%";
+show status like "key_read%";
 
 select count(*) from t1 where b = 'test1';
-show status like "key_%";
+show status like "key_read%";
 select count(*) from t1 where b = 'test1';
-show status like "key_%";
+show status like "key_read%";
 
 flush tables; flush status;
 select @@preload_buffer_size;
-preload t1 keys;
-show status like "preload_%";
-show status like "key_%";
+load index into cache t1 keys;
+show status like "key_read%";
 select count(*) from t1 where b = 'test1';
-show status like "key_%";
+show status like "key_read%";
 
 flush tables; flush status;
-show status like "key_%";
+show status like "key_read%";
 set session preload_buffer_size=256*1024;
 select @@preload_buffer_size;
-preload t1 keys ignore leaves;
-show status like "key_%";
+load index into cache t1 keys ignore leaves;
+show status like "key_read%";
 select count(*) from t1 where b = 'test1';
-show status like "key_%";
+show status like "key_read%";
 
 flush tables; flush status; 
-show status like "key_%";
+show status like "key_read%";
 set session preload_buffer_size=1*1024;
 select @@preload_buffer_size;
-preload t1 keys, t2 keys (primary,b) ignore leaves;
-show status like "key_%";
+load index into cache t1 keys, t2 keys (primary,b) ignore leaves;
+show status like "key_read%";
 select count(*) from t1 where b = 'test1';
 select count(*) from t2 where b = 'test1';
-show status like "key_%";
+show status like "key_read%";
 
 flush tables; flush status;
-show status like "key_%";
-preload t3 keys, t2 keys (primary,b) ;
-show status like "key_%";
+show status like "key_read%";
+load index into cache t3 keys, t2 keys (primary,b) ;
+show status like "key_read%";
 
 flush tables; flush status;
-show status like "key_%";
-preload t3 keys (b), t2 keys (c) ;
-show status like "key_%";
+show status like "key_read%";
+load index into cache t3 keys (b), t2 keys (c) ;
+show status like "key_read%";
 
 drop table t1, t2;