MENT-510 Failing test(s): perfschema.threads_insert_delayed.

The thread_id of the INSERT DELAYED thread should not be set to 0.

mysql-test/suite/plugins/r/server_audit.result

@@ -221,7 +221,7 @@ connection cn1;
 create table t1(id int) engine=myisam;
 insert delayed into t1 values (1), (2);
 connection default;
-# Waiting until ALTER TABLE is blocked.
+# Waiting until INSERT DELAYED thread does the insert.
 drop table t1;
 disconnect cn1;
 drop user user1@localhost;

mysql-test/suite/plugins/t/server_audit.test

@@ -148,7 +148,7 @@ connection cn1;
 create table t1(id int) engine=myisam;
 insert delayed into t1 values (1), (2);
 connection default;
---echo # Waiting until ALTER TABLE is blocked.
+--echo # Waiting until INSERT DELAYED thread does the insert.
 let $wait_condition= SELECT COUNT(*) = 2 FROM t1;
 --source include/wait_condition.inc
 drop table t1;

sql/sql_insert.cc

@@ -2076,13 +2076,14 @@ class Delayed_insert :public ilink {
     passed from connection thread to the handler thread.
   */
   MDL_request grl_protection;
+  my_thread_id orig_thread_id;
   void set_default_user()
   {
     thd.security_ctx->user=(char*) delayed_user;
     thd.security_ctx->host=(char*) my_localhost;
     thd.security_ctx->ip= NULL;
     thd.query_id= 0;
-    thd.thread_id= 0;
+    thd.thread_id= orig_thread_id;
   }
 
   void set_user_from_row(const delayed_row *r)