bk commit into 4.1 tree (igor:1.2361) 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.2361 05/07/31 04:28:01 igor@stripped +2 -0
  null_key.result, null_key.test:
    Modified test case for bug #12144.

  mysql-test/r/null_key.result
    1.32 05/07/31 04:27:36 igor@stripped +3 -3
    Modified test case for bug #12144.

  mysql-test/t/null_key.test
    1.14 05/07/31 04:27:08 igor@stripped +1 -1
    Modified test case for bug #12144.

# 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.31/mysql-test/r/null_key.result	Thu Jul 28 17:52:41 2005
+++ 1.32/mysql-test/r/null_key.result	Sun Jul 31 04:27:36 2005
@@ -412,6 +412,9 @@
 2	NULL	NULL	NULL
 3	3	1	NULL
 4	NULL	NULL	NULL
+SELECT FOUND_ROWS();
+FOUND_ROWS()
+4
 SHOW STATUS LIKE "handler_read%";
 Variable_name	Value
 Handler_read_first	0
@@ -420,7 +423,4 @@
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	5
-SELECT FOUND_ROWS();
-FOUND_ROWS()
-4
 DROP TABLE t1,t2,t3,t4;

--- 1.13/mysql-test/t/null_key.test	Thu Jul 28 17:53:20 2005
+++ 1.14/mysql-test/t/null_key.test	Sun Jul 31 04:27:08 2005
@@ -233,8 +233,8 @@
 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();
+SHOW STATUS LIKE "handler_read%";
 
 DROP TABLE t1,t2,t3,t4;
 # End of 4.1 tests