--- suite/storage_engine/trx/xa.result 2012-07-13 01:47:00.788899248 +0400 +++ suite/storage_engine/trx/xa.reject 2012-07-15 16:55:51.604328125 +0400 @@ -1,3 +1,9 @@ +# -- WARNING ---------------------------------------------------------------- +# According to I_S.ENGINES, MyISAM does not support XA. +# If it is true, the test will most likely fail; you can +# either create an rdiff file, or add the test to disabled.def. +# If XA should be supported, check the data in Information Schema. +# --------------------------------------------------------------------------- DROP TABLE IF EXISTS t1; connect con1,localhost,root,,; connect con2,localhost,root,,; @@ -9,17 +15,22 @@ connection con1; SELECT a FROM t1; a +1 connection con2; INSERT INTO t1 (a) VALUES (2); XA END 'xa1'; connection con1; SELECT a FROM t1; a +1 +2 connection con2; XA PREPARE 'xa1'; connection con1; SELECT a FROM t1; a +1 +2 connection con2; XA RECOVER; formatID gtrid_length bqual_length data @@ -38,6 +49,7 @@ a 1 2 +3 connection con2; INSERT INTO t1 (a) VALUES (4); XA END 'xa2'; @@ -46,6 +58,8 @@ a 1 2 +3 +4 connection con2; XA COMMIT 'xa2' ONE PHASE; connection con1; @@ -65,6 +79,7 @@ 2 3 4 +5 connection con2; INSERT INTO t1 (a) VALUES (6); XA END 'xa3'; @@ -75,6 +90,8 @@ 2 3 4 +5 +6 connection con2; XA PREPARE 'xa3'; connection con1; @@ -84,8 +101,12 @@ 2 3 4 +5 +6 connection con2; XA ROLLBACK 'xa3'; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back connection con1; SELECT a FROM t1; a @@ -93,4 +114,6 @@ 2 3 4 +5 +6 DROP TABLE t1;