Commit 22331e4a authored by Vasil Dimov's avatar Vasil Dimov

Merge mysql-5.5-innodb -> mysql-5.5

parents 208b98d5 4923b866
...@@ -28,6 +28,8 @@ UPDATE t SET b=4*a WHERE a=32; ...@@ -28,6 +28,8 @@ UPDATE t SET b=4*a WHERE a=32;
XA END '789'; XA END '789';
XA PREPARE '789'; XA PREPARE '789';
CONNECT (con3,localhost,root,,);
CONNECTION con3;
# The server would issue this warning on restart. # The server would issue this warning on restart.
call mtr.add_suppression("Found 3 prepared XA transactions"); call mtr.add_suppression("Found 3 prepared XA transactions");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment