Merge 5.5 into 10.1

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

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';