Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ

1 files changed, 23 insertions, 0 deletions

diff --git a/mysql-test/suite/innodb/r/innodb-blob.result b/mysql-test/suite/innodb/r/innodb-blob.result
index a90f83945e0..ec5a4a8b0ac 100644
--- a/mysql-test/suite/innodb/r/innodb-blob.result
+++ b/mysql-test/suite/innodb/r/innodb-blob.result
@@ -8,17 +8,22 @@ UPDATE t1 SET a=a+2;
 ROLLBACK;
 BEGIN;
 UPDATE t1 SET b=CONCAT(b,'foo');
+connect  con1,localhost,root,,;
 SET DEBUG_SYNC='now WAIT_FOR have_latch';
 SELECT a, RIGHT(b,20) FROM t1;
+connect  con2,localhost,root,,;
 SET DEBUG_SYNC='now SIGNAL go1';
+connection con1;
 a	RIGHT(b,20)
 1	aaaaaaaaaaaaaaaaaaaa
 2	bbbbbbbbbbbbbbbbbbbb
+connection default;
 SET DEBUG_DBUG='+d,row_ins_extern_checkpoint';
 SET DEBUG_SYNC='before_row_ins_extern_latch SIGNAL rec_not_blob WAIT_FOR crash';
 ROLLBACK;
 BEGIN;
 INSERT INTO t1 VALUES (3,REPEAT('c',50000));
+connection con1;
 SET DEBUG_SYNC='now WAIT_FOR rec_not_blob';
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT @@tx_isolation;
@@ -36,6 +41,9 @@ a
 SET DEBUG_DBUG='+d,crash_commit_before';
 INSERT INTO t2 VALUES (42);
 ERROR HY000: Lost connection to MySQL server during query
+disconnect con1;
+disconnect con2;
+connection default;
 ERROR HY000: Lost connection to MySQL server during query
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
@@ -45,26 +53,34 @@ INSERT INTO t3 VALUES
 (2,REPEAT('g',7000),REPEAT('h',100));
 SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR go';
 UPDATE t3 SET c=REPEAT('f',3000) WHERE a=1;
+connect  con1,localhost,root,,;
 SET DEBUG_SYNC='now WAIT_FOR have_latch';
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT @@tx_isolation;
 @@tx_isolation
 READ-UNCOMMITTED
 SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3;
+connect  con2,localhost,root,,;
 SET DEBUG_SYNC='now SIGNAL go';
+connection con1;
 a	RIGHT(b,20)	RIGHT(c,20)
 1	dddddddddddddddddddd	ffffffffffffffffffff
 2	gggggggggggggggggggg	hhhhhhhhhhhhhhhhhhhh
+disconnect con1;
+connection default;
 CHECK TABLE t1,t2,t3;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 test.t2	check	status	OK
 test.t3	check	status	OK
+connection con2;
 BEGIN;
 INSERT INTO t2 VALUES (347);
+connection default;
 SET DEBUG_DBUG='+d,row_upd_extern_checkpoint';
 SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR crash';
 UPDATE t3 SET c=REPEAT('i',3000) WHERE a=2;
+connection con2;
 SET DEBUG_SYNC='now WAIT_FOR have_latch';
 SELECT info FROM information_schema.processlist
 WHERE state = 'debug sync point: before_row_upd_extern';
@@ -73,6 +89,8 @@ UPDATE t3 SET c=REPEAT('i',3000) WHERE a=2
 SET DEBUG_DBUG='+d,crash_commit_before';
 COMMIT;
 ERROR HY000: Lost connection to MySQL server during query
+disconnect con2;
+connection default;
 ERROR HY000: Lost connection to MySQL server during query
 CHECK TABLE t1,t2,t3;
 Table	Op	Msg_type	Msg_text
@@ -87,11 +105,14 @@ SELECT a FROM t3;
 a
 1
 2
+connect  con2,localhost,root,,;
 BEGIN;
 INSERT INTO t2 VALUES (33101);
+connection default;
 SET DEBUG_DBUG='+d,row_upd_extern_checkpoint';
 SET DEBUG_SYNC='after_row_upd_extern SIGNAL have_latch WAIT_FOR crash';
 UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2;
+connection con2;
 SET DEBUG_SYNC='now WAIT_FOR have_latch';
 SELECT info FROM information_schema.processlist
 WHERE state = 'debug sync point: after_row_upd_extern';
@@ -100,6 +121,8 @@ UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2
 SET DEBUG_DBUG='+d,crash_commit_before';
 COMMIT;
 ERROR HY000: Lost connection to MySQL server during query
+disconnect con2;
+connection default;
 ERROR HY000: Lost connection to MySQL server during query
 CHECK TABLE t1,t2,t3;
 Table	Op	Msg_type	Msg_text