diff options
Diffstat (limited to 'mysql-test/suite/vcol/inc/vcol_trigger_sp.inc')
| -rw-r--r-- | mysql-test/suite/vcol/inc/vcol_trigger_sp.inc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/suite/vcol/inc/vcol_trigger_sp.inc b/mysql-test/suite/vcol/inc/vcol_trigger_sp.inc index f807405d18d..80ce44a6024 100644 --- a/mysql-test/suite/vcol/inc/vcol_trigger_sp.inc +++ b/mysql-test/suite/vcol/inc/vcol_trigger_sp.inc @@ -110,7 +110,7 @@ drop table t1,t2; drop procedure p1; --echo # ---echo # Bug mdev-3845: values of virtual columns are not computed for triggers +--echo # MDEV-3845 values of virtual columns are not computed for triggers --echo # CREATE TABLE t1 ( @@ -149,6 +149,7 @@ DROP TRIGGER t1_ins_aft; DROP TRIGGER t1_del_bef; DROP TABLE t1,t2; +<<<<<<< HEAD --echo # --echo # Examine the number of times triggers are recalculated for updates --echo # @@ -280,4 +281,12 @@ select * from t1; drop trigger t1_ins; drop trigger t1_update; +======= +# +# MDEV-11706 Assertion `is_stat_field || !table || (!table->write_set || bitmap_is_set(table->write_set, field_index) || (table->vcol_set && bitmap_is_set(table->vcol_set, field_index)))' failed in Field_time::store_TIME_with_warning +# +create table t1 (i int, t time not null, vt time(4) as (t) virtual); +create trigger trg before update on t1 for each row set @a = 1; +insert ignore into t1 (i) values (1); +>>>>>>> origin/10.1 drop table t1; |