bzr push into mysql-6.0-bka-preview branch (igor:2666 to 2667)

[Igor Babaev]

 2667 Igor Babaev	2008-11-05
      Removed the output of the ANALYZE command within the join_cache.test
      to make the result file platform independent.
modified:
  mysql-test/r/join_cache.result
  mysql-test/t/join_cache.test

 2666 Igor Babaev	2008-11-04
      Made the the 'rows' column to be ignored in the output of
      the EXPLAIN command for one of the test cases.
modified:
  mysql-test/r/join_cache.result
  mysql-test/t/join_cache.test

=== modified file 'mysql-test/r/join_cache.result'
--- a/mysql-test/r/join_cache.result	2008-11-05 07:23:12 +0000
+++ b/mysql-test/r/join_cache.result	2008-11-05 17:54:15 +0000
@@ -21,10 +21,6 @@ Country char(3) NOT NULL default '',
 Language char(30) NOT NULL default '',
 Percentage float(3,1) NOT NULL default '0.0'
 );
-Table	Op	Msg_type	Msg_text
-world.Country	analyze	status	OK
-world.City	analyze	status	OK
-world.CountryLanguage	analyze	status	OK
 SELECT COUNT(*) FROM Country;
 COUNT(*)
 239
@@ -828,10 +824,6 @@ Percentage float(3,1) NOT NULL default '
 PRIMARY KEY  (Country, Language),
 INDEX (Percentage)
 );
-Table	Op	Msg_type	Msg_text
-world.Country	analyze	status	OK
-world.City	analyze	status	OK
-world.CountryLanguage	analyze	status	OK
 show variables like 'join_buffer_size';
 Variable_name	Value
 join_buffer_size	131072

=== modified file 'mysql-test/t/join_cache.test'
--- a/mysql-test/t/join_cache.test	2008-11-05 07:23:12 +0000
+++ b/mysql-test/t/join_cache.test	2008-11-05 17:54:15 +0000
@@ -12,9 +12,11 @@ use world;
 --source include/world_schema1.inc
 
 --disable_query_log
+--disable_result_log
 --disable_warnings
 --source include/world.inc
 --enable_warnings
+--enable_result_log
 --enable_query_log
 
 SELECT COUNT(*) FROM Country;
@@ -150,9 +152,11 @@ use world;
 --source include/world_schema.inc
 
 --disable_query_log
+--disable_result_log
 --disable_warnings
 --source include/world.inc
 --enable_warnings
+--enable_result_log
 --enable_query_log
 
 show variables like 'join_buffer_size';