MDEV-4480 Assertion `inited == NONE' fails on closing a connection with open...

MDEV-4480 Assertion `inited == NONE' fails on closing a connection with open handler on temporary table

mysql-test/suite/handler/disconnect_4480.result

+create temporary table t1 as select 1;
+handler t1 open;
+handler t1 read next;
+1
+1

mysql-test/suite/handler/disconnect_4480.test

+#
+# MDEV-4480 Assertion `inited == NONE' fails on closing a connection with open handler on temporary table
+#
+
+--connect (con1,localhost,root,,)
+create temporary table t1 as select 1;
+handler t1 open;
+handler t1 read next;
+--disconnect con1
+

sql/sql_class.cc

@@ -1390,6 +1390,8 @@ void THD::cleanup(void)
   }
 #endif
 
+  mysql_ha_cleanup(this);
+
   close_temporary_tables(this);
 
   transaction.xid_state.xa_state= XA_NOTR;
@@ -1397,7 +1399,6 @@ void THD::cleanup(void)
   xid_cache_delete(&transaction.xid_state);
 
   locked_tables_list.unlock_locked_tables(this);
-  mysql_ha_cleanup(this);
 
   DBUG_ASSERT(open_tables == NULL);
   /*