Commit 5b8c8a6c authored by Davi Arnaut's avatar Davi Arnaut

Merge from mysql-5.0-5.1.29-rc into mysql-5.0-bugteam

parents a68f6a9c b6fbc38c
......@@ -73,4 +73,5 @@ xa end 'a','c';
ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
xa rollback 'a','c';
xa start 'a','c';
drop table t1;
End of 5.0 tests
......@@ -116,5 +116,6 @@ xa start 'a','c';
--disconnect con1
--disconnect con3
--connection default
drop table t1;
--echo End of 5.0 tests
......@@ -7,6 +7,11 @@
/* @(#) $Id$ */
/* Need to be included "early" to control other headers */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h>
#include "zutil.h"
......
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