bzr commit into mysql-5.1-bugteam branch (john.embretsen:3156) Bug#47746

[John H. Embretsen]

#At file:///export/home/tmp/je159969/mysql-dev/bzr-repos/mysql-5.1-bugteam-sandbox/ based on revid:frazer@stripped

 3156 John H. Embretsen	2009-10-05
      Bug#47746 - main.innodb_mysql fails sporadically:
      Mask part of EXPLAIN output with '#' to account for varying row count estimation.
     @ mysql-test/include/mix1.inc
        Mask 'rows' column in EXPLAIN output (number varies sometimes between 1 and 2).
     @ mysql-test/r/innodb_mysql.result
        Update result file after masking of rows estimation in EXPLAIN output.

    modified:
      mysql-test/include/mix1.inc
      mysql-test/r/innodb_mysql.result
=== modified file 'mysql-test/include/mix1.inc'
--- a/mysql-test/include/mix1.inc	2009-07-13 17:41:43 +0000
+++ b/mysql-test/include/mix1.inc	2009-10-05 13:16:27 +0000
@@ -442,6 +442,8 @@ INSERT INTO t1(id, dept, age, name) VALU
 EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
 SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
 DELETE FROM t1;
+--echo # Masking (#) number in "rows" column of the following EXPLAIN output, as it may vary (bug#47746).
+--replace_column 9 #
 EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
 SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
 

=== modified file 'mysql-test/r/innodb_mysql.result'
--- a/mysql-test/r/innodb_mysql.result	2009-07-13 17:41:43 +0000
+++ b/mysql-test/r/innodb_mysql.result	2009-10-05 13:16:27 +0000
@@ -385,9 +385,10 @@ name	dept
 rs5	cs10
 rs5	cs9
 DELETE FROM t1;
+# Masking (#) number in "rows" column of the following EXPLAIN output, as it may vary (bug#47746).
 EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	name	name	44	NULL	2	Using where; Using index for group-by
+1	SIMPLE	t1	range	name	name	44	NULL	#	Using where; Using index for group-by
 SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
 name	dept
 DROP TABLE t1;


Attachment: [text/bzr-bundle] bzr/[e-mail]