database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2002-05-09 17:30:58 +03:00
parent 34a9241f86 d9e182de2e
commit 5ba6d537e5
5 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_delete.cc
View File

@@ -176,15 +176,15 @@ cleanup:
}
if (using_transactions && ha_autocommit_or_rollback(thd,error >= 0))
error=1;
if (deleted)
{
query_cache_invalidate3(thd, table_list, 1);
}
if (thd->lock)
{
mysql_unlock_tables(thd, thd->lock);
thd->lock=0;
}
if (deleted)
{
query_cache_invalidate3(thd, table_list, 1);
}
delete select;
if (error >= 0) // Fatal error
send_error(&thd->net,thd->killed ? ER_SERVER_SHUTDOWN: 0);
@@ -357,6 +357,9 @@ void multi_delete::send_error(uint errcode,const char *err)
if (!deleted)
DBUG_VOID_RETURN;
/* Somthing alredy deleted consequently we have to invalidate cache */
query_cache_invalidate3(thd, delete_tables, 1);
/* Below can happen when thread is killed early ... */
if (!table_being_deleted)
table_being_deleted=delete_tables;