database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-5122: "Commands out of sync", "Malformed packet" or client hang up...

Browse Source 
- When INSERT catches an error, it should not attempt to send parts of 
  EXPLAIN output.
This commit is contained in:
Sergey Petrunya
2013-10-11 19:27:53 +04:00
parent a1705b762e
commit 3e8f7c8516
3 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_insert.cc
View File

@@ -819,8 +819,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
save_insert_query_plan(thd, table_list);
if (thd->lex->describe)
{
retval= 0;
goto exit_without_my_ok;
retval= thd->lex->explain->send_explain(thd);
goto free_and_exit;
}
/*
@@ -1170,15 +1170,14 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
DBUG_RETURN(FALSE);
abort:
exit_without_my_ok:
#ifndef EMBEDDED_LIBRARY
if (lock_type == TL_WRITE_DELAYED)
end_delayed_insert(thd);
#endif
if (table != NULL)
table->file->ha_release_auto_increment();
retval= thd->lex->explain->send_explain(thd);
free_and_exit:
if (!joins_freed)
free_underlaid_joins(thd, &thd->lex->select_lex);
thd->abort_on_warning= 0;