Merge 5.5 into 10.1

MariaDB · May 26, 2020 · adbf85f · adbf85f
2 parents 76f4ae8 + 9bbd685
commit adbf85f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/mysql-test/r/processlist_notembedded.result b/mysql-test/r/processlist_notembedded.result
@@ -5,5 +5,6 @@ SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync WAIT_FOR go';
 SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
 FOUND /sleep/ in MDEV-20466.text
 SET DEBUG_SYNC= 'now SIGNAL go';
+user
 SET DEBUG_SYNC = 'RESET';
 End of 5.5 tests
diff --git a/mysql-test/t/processlist_notembedded.test b/mysql-test/t/processlist_notembedded.test
@@ -30,7 +30,10 @@ remove_file $MYSQLTEST_VARDIR/tmp//MDEV-20466.text;
 
 SET DEBUG_SYNC= 'now SIGNAL go';
 
+connection con1;
+reap;
 disconnect con1;
+connection default;
 
 SET DEBUG_SYNC = 'RESET';