mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
merge
This commit is contained in:
@@ -318,15 +318,15 @@ int mysql_update(THD *thd,
|
||||
}
|
||||
if (using_transactions && ha_autocommit_or_rollback(thd, error >= 0))
|
||||
error=1;
|
||||
if (updated)
|
||||
{
|
||||
query_cache_invalidate3(thd, table_list, 1);
|
||||
}
|
||||
if (thd->lock)
|
||||
{
|
||||
mysql_unlock_tables(thd, thd->lock);
|
||||
thd->lock=0;
|
||||
}
|
||||
if (updated)
|
||||
{
|
||||
query_cache_invalidate3(thd, table_list, 1);
|
||||
}
|
||||
|
||||
delete select;
|
||||
if (error >= 0)
|
||||
@@ -644,6 +644,10 @@ void multi_update::send_error(uint errcode,const char *err)
|
||||
/* If nothing updated return */
|
||||
if (!updated)
|
||||
return;
|
||||
|
||||
/* Somthing alredy updated consequently we have to invalidate cache */
|
||||
query_cache_invalidate3(thd, update_tables, 1);
|
||||
|
||||
/* Below can happen when thread is killed early ... */
|
||||
if (!table_being_updated)
|
||||
table_being_updated=update_tables;
|
||||
|
Reference in New Issue
Block a user