mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
after merging fix
This commit is contained in:
@ -1339,7 +1339,7 @@ mysql_execute_command(THD *thd)
|
||||
{
|
||||
if (!(explain_result= new select_send()))
|
||||
{
|
||||
send_error(&thd->net, ER_OUT_OF_RESOURCES);
|
||||
send_error(thd, ER_OUT_OF_RESOURCES);
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
//check rights
|
||||
@ -1478,7 +1478,7 @@ mysql_execute_command(THD *thd)
|
||||
if (!explain_result)
|
||||
if (!(explain_result= new select_send()))
|
||||
{
|
||||
send_error(&thd->net, ER_OUT_OF_RESOURCES);
|
||||
send_error(thd, ER_OUT_OF_RESOURCES);
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user