[t:4297], fix test for 5.5

git-svn-id: file:///svn/mysql/tests/mysql-test@41756 c7de825b-a66e-492c-adef-691d508d4ae1

mysql-test/suite/tokudb.bugs/r/xa-6.result

@@ -12,6 +12,7 @@ ERROR HY000: Lost connection to MySQL server during query
 xa commit'a','ab';
 ERROR XAE04: XAER_NOTA: Unknown XID
 drop table t1;
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=tokudb;
 xa begin 'a','ab';
 insert into t1 values (1);
@@ -20,7 +21,6 @@ a
 1
 xa end 'a','ab';
 SET SESSION debug="d,tokudb_crash_prepare_after";
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
 xa prepare 'a','ab';
 ERROR HY000: Lost connection to MySQL server during query
 xa commit 'a','ab';
@@ -36,7 +36,6 @@ a
 1
 xa end 'a','ab';
 SET SESSION debug="d,tokudb_crash_prepare_after";
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
 xa prepare 'a','ab';
 ERROR HY000: Lost connection to MySQL server during query
 xa rollback 'a','ab';
@@ -51,7 +50,6 @@ a
 1
 xa end 'a','ab';
 SET SESSION debug="d,tokudb_crash_commit_before";
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
 xa prepare 'a','ab';
 xa commit 'a','ab';
 ERROR HY000: Lost connection to MySQL server during query
@@ -68,7 +66,6 @@ a
 1
 xa end 'a','ab';
 SET SESSION debug="d,tokudb_crash_commit_before";
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
 xa prepare 'a','ab';
 xa commit 'a','ab';
 ERROR HY000: Lost connection to MySQL server during query

mysql-test/suite/tokudb.bugs/t/xa-6.test

@@ -27,6 +27,10 @@ xa prepare 'a','ab';
 xa commit'a','ab';
 drop table t1;
 
+# this warning is expected, we want to test that
+# a prepared transaction is around after we come back up
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
+
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=tokudb;
 xa begin 'a','ab';
 insert into t1 values (1);
@@ -35,9 +39,6 @@ xa end 'a','ab';
 SET SESSION debug="d,tokudb_crash_prepare_after";
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-# this warning is expected, we want to test that
-# a prepared transaction is around after we come back up
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
 
 --error 2013
 xa prepare 'a','ab';
@@ -59,10 +60,6 @@ xa end 'a','ab';
 SET SESSION debug="d,tokudb_crash_prepare_after";
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-# this warning is expected, we want to test that
-# a prepared transaction is around after we come back up
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-
 --error 2013
 xa prepare 'a','ab';
 
@@ -83,10 +80,6 @@ xa end 'a','ab';
 SET SESSION debug="d,tokudb_crash_commit_before";
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-# this warning is expected, we want to test that
-# a prepared transaction is around after we come back up
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-
 xa prepare 'a','ab';
 --error 2013
 xa commit 'a','ab';
@@ -107,9 +100,6 @@ xa end 'a','ab';
 SET SESSION debug="d,tokudb_crash_commit_before";
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-# this warning is expected, we want to test that
-# a prepared transaction is around after we come back up
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
 
 xa prepare 'a','ab';
 --error 2013