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

Merge olga.mysql.com:/home/igor/mysql-5.0-opt

Browse Source 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
This commit is contained in:
igor@olga.mysql.com
2007-02-13 01:34:36 -08:00
parent 4aab8494e9 30614d22c1
commit fb9e0ad3be
31 changed files with 658 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_update.cc
View File

@ -26,7 +26,7 @@
/* Return 0 if row hasn't changed */
static bool compare_record(TABLE *table)
bool compare_record(TABLE *table, query_id_t query_id)
{
if (table->s->blob_fields + table->s->varchar_fields == 0)
return cmp_record(table,record[1]);
@ -1569,6 +1569,15 @@ int multi_update::do_updates(bool from_send_error)
if (!can_compare_record || compare_record(table))
{
int error;
if ((error= cur_table->view_check_option(thd, ignore)) !=
VIEW_CHECK_OK)
{
if (error == VIEW_CHECK_SKIP)
continue;
else if (error == VIEW_CHECK_ERROR)
goto err;
}
if ((local_error=table->file->ha_update_row(table->record[1],
table->record[0])))
{