database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Automerge MariaDB 5.1->5.2.

Browse Source
This commit is contained in:
unknown
2010-07-09 13:39:19 +02:00
parent b95bd9f5e2 ee45ab0694
commit 2be1a25faa
30 changed files with 1332 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/pbxt/r/pbxt_xa.result
View File

@ -1,5 +1,4 @@
drop table if exists t1, t2;
CALL mtr.add_suppression("Found wrong usage of mutex 'LOCK_sync' and 'LOCK_active'");
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
CREATE TABLE t2 (b INT PRIMARY KEY) ENGINE=pbxt;
BEGIN;

5
mysql-test/suite/pbxt/t/pbxt_xa.test
View File

@ -4,11 +4,6 @@
drop table if exists t1, t2;
--enable_warnings
# This warning is indication of a real bug, MBug#578117.
# But it is not a regression, so we suppress it to get a clean test run.
# This suppression must be removed as part of MBug#578117 fix.
CALL mtr.add_suppression("Found wrong usage of mutex 'LOCK_sync' and 'LOCK_active'");
#
# bug lp:544173, xa crash with two 2pc-capable storage engines without binlog
#