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

SQL: fix for lost code in debug macros

Browse Source
This commit is contained in:
Kosov Eugene
2016-09-22 15:03:05 +03:00
committed by Aleksey Midenkov
parent d8c8d7b946
commit bd0b21d22c
4 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_update.cc
View File

@ -763,11 +763,8 @@ int mysql_update(THD *thd,
TRG_EVENT_UPDATE))
break; /* purecov: inspected */
if (table->versioned() && table->vers_update_fields())
{
error= 1;
break;
}
if (table->versioned())
table->vers_update_fields();
found++;
@ -2173,12 +2170,8 @@ int multi_update::send_data(List<Item> &not_used_values)
if (table->default_field && table->update_default_fields(1, ignore))
DBUG_RETURN(1);
if (table->versioned() &&
table->vers_update_fields())
{
error= 1;
break;
}
if (table->versioned())
table->vers_update_fields();
if ((error= cur_table->view_check_option(thd, ignore)) !=
VIEW_CHECK_OK)
@ -2514,11 +2507,8 @@ int multi_update::do_updates()
goto err2;
}
}
if (table->versioned() &&
table->vers_update_fields())
{
goto err2;
}
if (table->versioned())
table->vers_update_fields();
if ((local_error=table->file->ha_update_row(table->record[1],
table->record[0])) &&