summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-04-28 22:18:15 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2016-04-28 22:18:15 +0200
commit9eba34f08675c31b0796eeb127582be827773070 (patch)
treec7a0e0e6e166376377a47a82b1079b9076922fcf /sql
parent94bad73dd1dd563a3a324dcd519975f6d995dc88 (diff)
downloadmariadb-git-9eba34f08675c31b0796eeb127582be827773070.tar.gz
Fix crash due to heap corruption in main.shmmariadb-10.0.25
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 177018dd171..4dfe45683d6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6642,7 +6642,7 @@ pthread_handler_t handle_connections_shared_memory(void *arg)
thd->security_ctx->host= my_strdup(my_localhost, MYF(0)); /* Host is unknown */
create_new_thread(thd);
connect_number++;
- set_current_thd(thd);
+ set_current_thd(0);
continue;
errorconn: