database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE

Browse Source 
handling so that indexes are closed before trying to commit the
transaction. (Bug #15536)
This commit is contained in:
jimw@mysql.com
2005-12-08 12:33:33 -08:00
parent dd7d2d0a11
commit f7ff3d653a
5 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_update.cc
View File

@ -377,6 +377,7 @@ int mysql_update(THD *thd,
if (!log_delayed)
thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
}
free_underlaid_joins(thd, &thd->lex->select_lex);
if (transactional_table)
{
if (ha_autocommit_or_rollback(thd, error >= 0))
@ -389,7 +390,6 @@ int mysql_update(THD *thd,
thd->lock=0;
}
free_underlaid_joins(thd, &thd->lex->select_lex);
if (error >= 0)
send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN : 0); /* purecov: inspected */
else