Merge lp:~vkolesnikov/pbxt/pbxt-bug-430716-testcases into lp:pbxt

[Vladimir Kolesnikov]

=== modified file 'ChangeLog'
--- ChangeLog	2009-09-22 10:58:59 +0000
+++ ChangeLog	2009-09-22 17:03:39 +0000
@@ -3,6 +3,8 @@
 
 ------- 1.0.09d RC3 - Not yet released
 
+RN276: Added test case for replication on tables w/o PKs (see bug #430716)
+
 RN275: Fixed bug #430600: 'Failed to read auto-increment value from storage engine' error.
 
 RN274: Fixed bug #431240: This report is public edit xtstat fails if no PBXT table has been created. xtstat now accepts --database=information_schema or --database=pbxt. Depending on this setting PBXT will either use the information_schema.pbxt_statistics or the pbxt.statistics table. If information_schema is used, then the statistics are displayed even when no PBXT table exists. Recovery activity is also displayed, unless pbxt_support_xa=1, in which case MySQL will wait for PBXT recovery to complete before allowing connections. 

=== modified file 'test/mysql-test/lib/mtr_cases.pl'
--- test/mysql-test/lib/mtr_cases.pl	2008-09-30 14:26:58 +0000
+++ test/mysql-test/lib/mtr_cases.pl	2009-09-22 17:01:14 +0000
@@ -867,7 +867,9 @@
       {
 	# Test does not need binlog, add --skip-binlog to
 	# the options used when starting it
-	push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
+	if (not grep(/^--log-bin/,  @::opt_extra_mysqld_opt) and not grep(/^--log-bin/, @{$tinfo->{'master_opt'}})) {
+		push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
+	}
       }
     }
 

=== added file 'test/mysql-test/r/rpl_for_pbxt3.result'
--- test/mysql-test/r/rpl_for_pbxt3.result	1970-01-01 00:00:00 +0000
+++ test/mysql-test/r/rpl_for_pbxt3.result	2009-09-22 17:01:14 +0000
@@ -0,0 +1,15 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+use test;
+drop table if exists tb6_eng1;
+create table tb6_eng1 ( f1 int, f2 char (15), f3 decimal (5,3), f4 datetime, index (f1) );
+delete from tb6_eng1;
+insert into tb6_eng1 values ( 1, 'abc', 0.1, now() );
+update tb6_eng1 set f2 = 'def' where f1 = 1;
+delete from tb6_eng1;
+insert into tb6_eng1 values ( 1, 'abc', 0.1, now() );
+# Last SQL Error: 

=== added file 'test/mysql-test/t/rpl_for_pbxt3-master.opt'
--- test/mysql-test/t/rpl_for_pbxt3-master.opt	1970-01-01 00:00:00 +0000
+++ test/mysql-test/t/rpl_for_pbxt3-master.opt	2009-09-22 17:01:14 +0000
@@ -0,0 +1,1 @@
+--binlog-format=row --log-bin

=== added file 'test/mysql-test/t/rpl_for_pbxt3.test'
--- test/mysql-test/t/rpl_for_pbxt3.test	1970-01-01 00:00:00 +0000
+++ test/mysql-test/t/rpl_for_pbxt3.test	2009-09-22 17:01:14 +0000
@@ -0,0 +1,31 @@
+--disable_warnings
+source include/master-slave.inc;
+source include/have_binlog_format_mixed_or_row.inc;
+--enable_warnings
+--disable_abort_on_error
+connection master;
+
+use test;
+
+--disable_warnings
+drop table if exists tb6_eng1;
+--enable_warnings
+
+create table tb6_eng1 ( f1 int, f2 char (15), f3 decimal (5,3), f4 datetime, index (f1) );
+
+let $run=1;
+let $count=1;
+
+delete from tb6_eng1;
+insert into tb6_eng1 values ( 1, 'abc', 0.1, now() );
+
+update tb6_eng1 set f2 = 'def' where f1 = 1;
+real_sleep 1;
+delete from tb6_eng1;
+insert into tb6_eng1 values ( 1, 'abc', 0.1, now() );
+
+real_sleep 1;
+connection slave;
+let $slave_status=query_get_value( "show slave status", Last_SQL_Error, 1 );
+--echo # Last SQL Error: $slave_status
+