bk commit into 4.1 tree (igor:1.2358) BUG#12144

[igor]

Below is the list of changes that have just been committed into a local
4.1 repository of igor. When igor does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2358 05/07/28 17:53:51 igor@stripped +2 -0
  null_key.test, null_key.result:
    Made the test case for bug #12144 independent on other tests.

  mysql-test/t/null_key.test
    1.13 05/07/28 17:53:20 igor@stripped +1 -5
    Made the test case for bug #12144 independent on other tests.

  mysql-test/r/null_key.result
    1.31 05/07/28 17:52:41 igor@stripped +5 -12
    Made the test case for bug #12144 independent on other tests.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-4.1-0

--- 1.30/mysql-test/r/null_key.result	Thu Jul 28 16:01:09 2005
+++ 1.31/mysql-test/r/null_key.result	Thu Jul 28 17:52:41 2005
@@ -404,14 +404,7 @@
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	
 1	SIMPLE	t2	ref	idx	idx	5	test.t1.a	1	
 1	SIMPLE	t3	ref	idx	idx	5	test.t2.b	1	Using index
-SHOW STATUS LIKE "handler_read%";
-Variable_name	Value
-Handler_read_first	25
-Handler_read_key	63
-Handler_read_next	25979
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	147
+FLUSH STATUS ;
 SELECT SQL_CALC_FOUND_ROWS * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
 LEFT JOIN t3 ON t2.b=t3.b;
 a	a	b	b
@@ -421,12 +414,12 @@
 4	NULL	NULL	NULL
 SHOW STATUS LIKE "handler_read%";
 Variable_name	Value
-Handler_read_first	25
-Handler_read_key	69
-Handler_read_next	25981
+Handler_read_first	0
+Handler_read_key	6
+Handler_read_next	2
 Handler_read_prev	0
 Handler_read_rnd	0
-Handler_read_rnd_next	152
+Handler_read_rnd_next	5
 SELECT FOUND_ROWS();
 FOUND_ROWS()
 4

--- 1.12/mysql-test/t/null_key.test	Thu Jul 28 16:04:14 2005
+++ 1.13/mysql-test/t/null_key.test	Thu Jul 28 17:53:20 2005
@@ -230,14 +230,10 @@
 
 EXPLAIN SELECT SQL_CALC_FOUND_ROWS * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
                                              LEFT JOIN t3 ON t2.b=t3.b;
-SHOW STATUS LIKE "handler_read%";
-
-
+FLUSH STATUS ;
 SELECT SQL_CALC_FOUND_ROWS * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
                                      LEFT JOIN t3 ON t2.b=t3.b;
-
 SHOW STATUS LIKE "handler_read%";
-
 SELECT FOUND_ROWS();
 
 DROP TABLE t1,t2,t3,t4;