database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +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

13
sql/sql_insert.cc
View File

@ -1029,12 +1029,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
}
}
if (table->versioned() &&
table->vers_update_fields())
{
error= 1;
break;
}
if (table->versioned())
table->vers_update_fields();
if ((res= table_list->view_check_option(thd,
(values_list.elements == 1 ?
@ -3799,9 +3795,8 @@ int select_insert::send_data(List<Item> &values)
DBUG_RETURN(0);
thd->count_cuted_fields= CHECK_FIELD_WARN; // Calculate cuted fields
if (table->versioned() &&
table->vers_update_fields())
DBUG_RETURN(1);
if (table->versioned())
table->vers_update_fields();
store_values(values);
if (table->default_field && table->update_default_fields(0, info.ignore))
DBUG_RETURN(1);