Skip to content

Commit

Permalink
fix func_hybrid_type crash in --ps --embedded
Browse files Browse the repository at this point in the history
create_embedded_thd() must reset current_thd before returning,
otherwise client [de-]allocations will be happening in that
stray THD context
  • Loading branch information
vuvova committed Oct 14, 2015
1 parent b867ade commit 2a471e8
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions libmysqld/lib_sql.cc
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,7 @@ void *create_embedded_thd(int client_flag)
threads.append(thd);
mysql_mutex_unlock(&LOCK_thread_count);
thd->mysys_var= 0;
thd->reset_globals();
return thd;
err:
delete(thd);
Expand Down

0 comments on commit 2a471e8

Please sign in to comment.