mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
MDEV-30307 addendum: support for compilation in release mode
This commit is contained in:
parent
cf0c3ec274
commit
95d285fb75
3 changed files with 44 additions and 30 deletions
37
mysql-test/suite/galera/r/galera_bf_kill,debug.rdiff
Normal file
37
mysql-test/suite/galera/r/galera_bf_kill,debug.rdiff
Normal file
|
@ -0,0 +1,37 @@
|
|||
--- a/home/panda/mariadb-10.5/mysql-test/suite/galera/r/galera_bf_kill.result
|
||||
+++ b/home/panda/mariadb-10.5/mysql-test/suite/galera/r/galera_bf_kill.reject
|
||||
@@ -77,4 +77,34 @@ a b
|
||||
5 2
|
||||
disconnect node_2a;
|
||||
connection node_1;
|
||||
+connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
||||
+connection node_2a;
|
||||
+truncate t1;
|
||||
+insert into t1 values (7,0);
|
||||
+connection node_2;
|
||||
+set wsrep_sync_wait=0;
|
||||
+begin;
|
||||
+update t1 set b=2 where a=7;
|
||||
+connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
||||
+set wsrep_sync_wait=0;
|
||||
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
|
||||
+connection node_1;
|
||||
+update t1 set b=1 where a=7;
|
||||
+connection node_2b;
|
||||
+SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached";
|
||||
+connection node_2;
|
||||
+connection node_2b;
|
||||
+SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
|
||||
+connection node_2;
|
||||
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
|
||||
+commit;
|
||||
+select * from t1;
|
||||
+a b
|
||||
+7 1
|
||||
+connection node_2a;
|
||||
+SET DEBUG_SYNC= 'RESET';
|
||||
+SET GLOBAL debug_dbug = "";
|
||||
+disconnect node_2a;
|
||||
+disconnect node_2b;
|
||||
+connection node_1;
|
||||
drop table t1;
|
|
@ -77,33 +77,4 @@ a b
|
|||
5 2
|
||||
disconnect node_2a;
|
||||
connection node_1;
|
||||
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
||||
connection node_2a;
|
||||
truncate t1;
|
||||
insert into t1 values (7,0);
|
||||
connection node_2;
|
||||
set wsrep_sync_wait=0;
|
||||
begin;
|
||||
update t1 set b=2 where a=7;
|
||||
connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
||||
set wsrep_sync_wait=0;
|
||||
SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
|
||||
connection node_1;
|
||||
update t1 set b=1 where a=7;
|
||||
connection node_2b;
|
||||
SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached";
|
||||
connection node_2;
|
||||
connection node_2b;
|
||||
SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
|
||||
connection node_2;
|
||||
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
|
||||
commit;
|
||||
select * from t1;
|
||||
a b
|
||||
7 1
|
||||
connection node_2a;
|
||||
SET DEBUG_SYNC= 'RESET';
|
||||
SET GLOBAL debug_dbug = "";
|
||||
drop table t1;
|
||||
disconnect node_2a;
|
||||
disconnect node_2b;
|
||||
|
|
|
@ -155,6 +155,8 @@ select * from t1;
|
|||
|
||||
--connection node_1
|
||||
|
||||
source include/maybe_debug.inc;
|
||||
if ($have_debug) {
|
||||
#
|
||||
# Test case 7: Start a transaction on node_2 and use KILL to abort
|
||||
# a query in connection node_2a
|
||||
|
@ -219,6 +221,10 @@ select * from t1;
|
|||
SET DEBUG_SYNC= 'RESET';
|
||||
SET GLOBAL debug_dbug = "";
|
||||
|
||||
drop table t1;
|
||||
--disconnect node_2a
|
||||
--disconnect node_2b
|
||||
|
||||
--connection node_1
|
||||
}
|
||||
|
||||
drop table t1;
|
||||
|
|
Loading…
Reference in a new issue