bzr commit into mysql-5.4 branch (mikael:2837)

[Mikael Ronstrom]

#At file:///home/mikael/mysql_clones/mysql-azalea-merge-from-summit/

 2837 Mikael Ronstrom	2009-07-02
      Fixed merge test case to use new minimum number of table_default_cache
      modified:
        mysql-test/r/merge.result
        mysql-test/t/merge.test

=== modified file 'mysql-test/r/merge.result'
--- a/mysql-test/r/merge.result	2009-04-22 10:02:28 +0000
+++ b/mysql-test/r/merge.result	2009-07-02 16:13:21 +0000
@@ -2039,10 +2039,10 @@ set @save_table_definition_cache=@@globa
 #
 # Set @@global.table_definition_cache to minimum
 #
-set @@global.table_definition_cache=256;
+set @@global.table_definition_cache=400;
 set @a=null;
 #
-# Create 256 merge children
+# Create 400 merge children
 #
 set @a=concat("create table t_parent (a int) union(", @a,
 ") insert_method=first engine=mrg_myisam");

=== modified file 'mysql-test/t/merge.test'
--- a/mysql-test/t/merge.test	2009-04-22 10:02:28 +0000
+++ b/mysql-test/t/merge.test	2009-07-02 16:13:21 +0000
@@ -1412,11 +1412,11 @@ set @save_table_definition_cache=@@globa
 --echo #
 --echo # Set @@global.table_definition_cache to minimum
 --echo #
-set @@global.table_definition_cache=256;
+set @@global.table_definition_cache=400;
 set @a=null;
-let $1 = 256;
+let $1 = 400;
 --echo #
---echo # Create 256 merge children
+--echo # Create 400 merge children
 --echo #
 --disable_query_log
 while ($1)
@@ -1448,7 +1448,7 @@ deallocate prepare stmt;
 --echo #
 --echo # Cleanup
 --echo #
-let $1 = 256;
+let $1 = 400;
 --disable_query_log
 while ($1)
 {