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

MDEV-9428 NO_AUTO_VALUE_ON_ZERO is ignored when a trigger before insert is defined

Browse Source 
fix the *other* fill_record() too, arrgh!
This commit is contained in:
Sergei Golubchik
2016-06-28 10:10:49 +02:00
parent 9c38308d8f
commit 6ce20fb2b9
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/trigger_null-8605.result
View File

@ -318,9 +318,8 @@ id
delete from t1; delete from t1;
create trigger t1_bi before insert on t1 for each row begin end; create trigger t1_bi before insert on t1 for each row begin end;
insert t1 values (0); insert t1 values (0);
select * from t1; insert t1 (id) values (0);
id ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
0
drop table t1; drop table t1;
create table t1 (a int not null, b int); create table t1 (a int not null, b int);
create trigger trgi before update on t1 for each row do 1; create trigger trgi before update on t1 for each row do 1;

3
mysql-test/t/trigger_null-8605.test
View File

@ -336,7 +336,8 @@ select * from t1;
delete from t1; delete from t1;
create trigger t1_bi before insert on t1 for each row begin end; create trigger t1_bi before insert on t1 for each row begin end;
insert t1 values (0); insert t1 values (0);
select * from t1; --error ER_DUP_ENTRY
insert t1 (id) values (0);
drop table t1; drop table t1;
# #

3
sql/sql_base.cc
View File

@ -8728,7 +8728,8 @@ fill_record(THD *thd, TABLE *table_arg, List<Item> &fields, List<Item> &values,
value=v++; value=v++;
Field *rfield= field->field; Field *rfield= field->field;
TABLE* table= rfield->table; TABLE* table= rfield->table;
if (rfield == table->next_number_field) if (table->next_number_field &&
rfield->field_index == table->next_number_field->field_index)
table->auto_increment_field_not_null= TRUE; table->auto_increment_field_not_null= TRUE;
if (rfield->vcol_info && if (rfield->vcol_info &&
value->type() != Item::DEFAULT_VALUE_ITEM && value->type() != Item::DEFAULT_VALUE_ITEM &&