mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-28 03:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bodhi.local:/opt/local/work/mysql-5.0-root

Browse source 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
This commit is contained in:
kostja@bodhi.local 2006-07-07 22:09:43 +04:00
commit 7bf73ac3e5
33 changed files with 1129 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/sql_update.cc
View file

@ -434,13 +434,15 @@ int mysql_update(THD *thd,
(MODE_STRICT_TRANS_TABLES |
MODE_STRICT_ALL_TABLES)));
if (table->triggers)
table->triggers->mark_fields_used(thd, TRG_EVENT_UPDATE);
/*
We can use compare_record() to optimize away updates if
the table handler is returning all columns
*/
can_compare_record= !(table->file->table_flags() &
HA_PARTIAL_COLUMN_READ);
while (!(error=info.read_record(&info)) && !thd->killed)
{
if (!(select && select->skip_record()))
@ -763,6 +765,9 @@ reopen_tables:
DBUG_RETURN(TRUE);
}
if (table->triggers)
table->triggers->mark_fields_used(thd, TRG_EVENT_UPDATE);
DBUG_PRINT("info",("setting table `%s` for update", tl->alias));
/*
If table will be updated we should not downgrade lock for it and