bk commit into 5.1 tree (gkodinov:1.2577) BUG#30393

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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@stripped, 2007-08-27 18:15:24+03:00, gkodinov@stripped +2 -0
  Bug #30393: Test "group_by" fails with a difference in "row count" 
    and strategy (explain)
  
  The fix for WL3527 adds tests that test if the index usage hints
  result in actually using the index. 
  The number of rows information is irrelevant in these tests : this 
  is not what is tested.
  On some platforms (currently AIX-5.2 32 bit) because of rounding or 
  storage engine specifics the number of rows in the EXPLAIN may vary.
  
  Fixed the test to ignore the rows column, because it's irrelevant 
  to the test at hand.

  mysql-test/r/group_by.result@stripped, 2007-08-27 18:15:23+03:00, gkodinov@stripped +1 -1
    Bug #30393: ignore column irrelevant to the test

  mysql-test/t/group_by.test@stripped, 2007-08-27 18:15:23+03:00, gkodinov@stripped +1 -0
    Bug #30393: ignore column irrelevant to the test

diff -Nrup a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
--- a/mysql-test/r/group_by.result	2007-08-03 18:45:44 +03:00
+++ b/mysql-test/r/group_by.result	2007-08-27 18:15:23 +03:00
@@ -1129,7 +1129,7 @@ ERROR 42000: You have an error in your S
 EXPLAIN SELECT a FROM t1 USE INDEX FOR JOIN (i2) 
 USE INDEX FOR GROUP BY (i2) GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	NULL	i2	9	NULL	144	Using index
+1	SIMPLE	t1	index	NULL	i2	9	NULL	#	Using index
 EXPLAIN SELECT a FROM t1 FORCE INDEX FOR JOIN (i2) 
 FORCE INDEX FOR GROUP BY (i2) GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
diff -Nrup a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
--- a/mysql-test/t/group_by.test	2007-07-31 09:12:19 +03:00
+++ b/mysql-test/t/group_by.test	2007-08-27 18:15:23 +03:00
@@ -828,6 +828,7 @@ EXPLAIN SELECT a FROM t1 USE INDEX (i2) 
 EXPLAIN SELECT a FROM t1 FORCE INDEX ();
 --error ER_PARSE_ERROR
 EXPLAIN SELECT a FROM t1 IGNORE INDEX ();
+--replace_column 9 #
 EXPLAIN SELECT a FROM t1 USE INDEX FOR JOIN (i2) 
   USE INDEX FOR GROUP BY (i2) GROUP BY a;
 EXPLAIN SELECT a FROM t1 FORCE INDEX FOR JOIN (i2)