Merge of fix for bug 44493 into GCA tree

mysql-test/r/innodb-autoinc-optimize.result

@@ -4,3 +4,5 @@ insert into t1 set a = -1;
 optimize table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
+==== clean up ====
+DROP TABLE t1;

mysql-test/t/innodb-autoinc-optimize.test

@@ -14,3 +14,6 @@ insert into t1 set a = -1;
 # NOTE: The database needs to be shutdown and restarted (here) for
 # the test to work. It's included for reference only.
 optimize table t1;
+
+--echo ==== clean up ====
+DROP TABLE t1;

mysql-test/t/innodb_notembedded.test

@@ -33,8 +33,15 @@ rollback;
 connection b;
 reap;
 rollback;
+
+# Cleanup
+connection a;
+disconnect a;
+--source include/wait_until_disconnected.inc
+connection b;
+disconnect b;
+--source include/wait_until_disconnected.inc
 connection default;
 drop table t1;
 drop function f1;
-disconnect a;
-disconnect b;
+