bzr push into mysql-6.0 branch (skozlov:2692 to 2693)

[Serge Kozlov]

 2693 Serge Kozlov	2008-09-10
      Fix for rpl_spec_variables
modified:
  mysql-test/suite/rpl/r/rpl_spec_variables.result
  mysql-test/suite/rpl/t/rpl_spec_variables.test

 2692 Serge Kozlov	2008-09-09
      WL#3690 MySQL-test for replication event to denote gap in replication:
            Added new test case rpl_ndb_denote_gap for checking LOST_EVENTS event.
      
      WL#3788: Test Write TABLE_TYPE, SQL_MODE etc to the binlog.
            Testing of the replication if master and slave have different values of 
            following system dynamic variables:
            AUTO_INCREMENT_(OFFSET|INCREMENT)
            CHARACTER_SET_DATABASE
            COLLATION_SERVER
            DEFAULT_WEEK_FORMAT
            LOCAL_INFILE
            MAX_HEAP_TABLE_SIZE
            STORAGE_ENGINE
            SQL_MODE
added:
  mysql-test/suite/rpl/r/rpl_spec_variables.result
  mysql-test/suite/rpl/t/rpl_spec_variables-slave.opt
  mysql-test/suite/rpl/t/rpl_spec_variables.test
  mysql-test/suite/rpl_ndb/r/rpl_ndb_denote_gap.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_denote_gap.test

=== modified file 'mysql-test/suite/rpl/r/rpl_spec_variables.result'
--- a/mysql-test/suite/rpl/r/rpl_spec_variables.result	2008-09-09 18:47:34 +0000
+++ b/mysql-test/suite/rpl/r/rpl_spec_variables.result	2008-09-10 10:05:07 +0000
@@ -124,16 +124,18 @@ DROP TABLE t1;
 SET @@global.max_heap_table_size=16384;
 SET @@session.max_heap_table_size=16384;
 CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY, b VARCHAR(10), c CHAR(254)) ENGINE=MEMORY;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-2000
-SELECT b,COUNT(*) FROM t1 GROUP BY b ORDER BY b;
-b	COUNT(*)
-master	2000
-slave	1740
-SELECT b,COUNT(*) FROM t2 GROUP BY b ORDER BY b;
-b	COUNT(*)
-slave	50
+SELECT COUNT(*)=2000 FROM t1;
+COUNT(*)=2000
+1
+SELECT COUNT(*)=2000 FROM t1 WHERE b='master' GROUP BY b ORDER BY b;
+COUNT(*)=2000
+1
+SELECT COUNT(*)<2000 AND COUNT(*)>0 FROM t1 WHERE b='slave' GROUP BY b ORDER BY b;
+COUNT(*)<2000 AND COUNT(*)>0
+1
+SELECT COUNT(*)<2000 AND COUNT(*)>0 FROM t2 WHERE b='slave' GROUP BY b ORDER BY b;
+COUNT(*)<2000 AND COUNT(*)>0
+1
 DROP TABLE IF EXISTS t1,t2;
 
 * storage_engine *

=== modified file 'mysql-test/suite/rpl/t/rpl_spec_variables.test'
--- a/mysql-test/suite/rpl/t/rpl_spec_variables.test	2008-09-09 18:47:34 +0000
+++ b/mysql-test/suite/rpl/t/rpl_spec_variables.test	2008-09-10 10:05:07 +0000
@@ -178,7 +178,7 @@ while ($counter) {
  dec $counter;
 }
 --enable_query_log
-SELECT COUNT(*) FROM t1;
+SELECT COUNT(*)=2000 FROM t1;
 
 --sync_slave_with_master
 let $counter=2000;
@@ -197,8 +197,11 @@ while ($counter) {
  dec $counter;
 }
 --enable_query_log
-SELECT b,COUNT(*) FROM t1 GROUP BY b ORDER BY b;
-SELECT b,COUNT(*) FROM t2 GROUP BY b ORDER BY b;
+# We don't know how many memory used and can't check exact values so need to check following 
+# conditions
+SELECT COUNT(*)=2000 FROM t1 WHERE b='master' GROUP BY b ORDER BY b;
+SELECT COUNT(*)<2000 AND COUNT(*)>0 FROM t1 WHERE b='slave' GROUP BY b ORDER BY b;
+SELECT COUNT(*)<2000 AND COUNT(*)>0 FROM t2 WHERE b='slave' GROUP BY b ORDER BY b;
 
 --connection master
 --disable_warnings