Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/null_key.result:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged

mysql-test/r/null_key.result

@@ -417,6 +417,9 @@ a	a	b	b
 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
@@ -425,7 +428,4 @@ Handler_read_next	2
 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;

mysql-test/t/null_key.test

@@ -235,8 +235,8 @@ EXPLAIN SELECT SQL_CALC_FOUND_ROWS * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
 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