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

MDEV-7824 [Bug #68041] Zero date can be inserted in strict no-zero mode through a default value

Browse Source
This commit is contained in:
Alexander Barkov
2015-06-26 10:16:51 +04:00
parent 874df5092b
commit 115904c2c8
20 changed files with 521 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sql/sql_insert.cc
View File

@ -872,10 +872,29 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
table->reset_default_fields();
if (fields.elements || !value_count)
{
/*
There are possibly some default values:
INSERT INTO t1 (fields) VALUES ...
INSERT INTO t1 VALUES ()
*/
if (table->validate_default_values_of_unset_fields(thd))
{
error= 1;
goto values_loop_end;
}
}
while ((values= its++))
{
if (fields.elements || !value_count)
{
/*
There are possibly some default values:
INSERT INTO t1 (fields) VALUES ...
INSERT INTO t1 VALUES ()
*/
restore_record(table,s->default_values); // Get empty record
if (fill_record_n_invoke_before_triggers(thd, table, fields, *values, 0,
TRG_EVENT_INSERT))
@ -896,6 +915,10 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
}
else
{
/*
No field list, all fields are set explicitly:
INSERT INTO t1 VALUES (values)
*/
if (thd->lex->used_tables) // Column used in values()
restore_record(table,s->default_values); // Get empty record
else
@ -967,6 +990,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
thd->get_stmt_da()->inc_current_row_for_warning();
}
values_loop_end:
free_underlaid_joins(thd, &thd->lex->select_lex);
joins_freed= TRUE;
@ -3555,6 +3579,8 @@ int select_insert::prepare2(void)
thd->locked_tables_mode <= LTM_LOCK_TABLES &&
!thd->lex->describe)
table->file->ha_start_bulk_insert((ha_rows) 0);
if (table->validate_default_values_of_unset_fields(thd))
DBUG_RETURN(1);
DBUG_RETURN(0);
}