1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix: use THD::main_mem_root for kill error message

Browse Source 
cannot use the current THD::mem_root, because it can be temporarily
reassigned to something with a very different life time
(e.g. to TABLE::mem_root or range optimizer mem_root).
This commit is contained in:
Sergei Golubchik 2020-05-20 17:02:47 +02:00
parent b01c8a6cc8
commit 1e951155bd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

@ -3729,7 +3729,8 @@ public:
The worst things that can happen is that we get The worst things that can happen is that we get
a suboptimal error message. a suboptimal error message.
*/ */
if ((killed_err= (err_info*) alloc(sizeof(*killed_err)))) killed_err= (err_info*) alloc_root(&main_mem_root, sizeof(*killed_err));
if (killed_err)
{ {
killed_err->no= killed_errno_arg; killed_err->no= killed_errno_arg;
::strmake((char*) killed_err->msg, killed_err_msg_arg, ::strmake((char*) killed_err->msg, killed_err_msg_arg,