Merge an addition to BUG51342 5.0-bugteam -> 5.1-bugteam.

a2c6f897 · Sergey Vojtovich · 2841eb94 · 41bbf45a · a2c6f897 · a2c6f897
Commit a2c6f897 authored Mar 10, 2010 by Sergey Vojtovich
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/xa.result mysql-test/r/xa.result +1 -1

mysql-test/t/xa.test mysql-test/t/xa.test +1 -1

No files found.
--- a/mysql-test/r/xa.result
+++ b/mysql-test/r/xa.result
@@ -90,7 +90,7 @@ INSERT INTO t1 VALUES(1);
 XA END 'x';
 XA COMMIT 'x' ONE PHASE;
 DROP TABLE t1;
-SET SESSION autocommit=DEFAULT;
+SET SESSION autocommit=1;
 End of 5.0 tests
 xa start 'a';
 xa end 'a';

--- a/mysql-test/t/xa.test
+++ b/mysql-test/t/xa.test
@@ -136,7 +136,7 @@ INSERT INTO t1 VALUES(1);
 XA END 'x';
 XA COMMIT 'x' ONE PHASE;
 DROP TABLE t1;
-SET SESSION autocommit=DEFAULT;
+SET SESSION autocommit=1;

 --echo End of 5.0 tests