1 files changed, 52 insertions, 0 deletions
diff --git a/mysql-test/main/function_defaults.result b/mysql-test/main/function_defaults.result
index 62422752e17..4a8f64df352 100644
--- a/mysql-test/main/function_defaults.result
+++ b/mysql-test/main/function_defaults.result
@@ -3093,3 +3093,55 @@ a	b
 1999-12-01 11:22:33.000000	1999-12-01 11:22:33.000000
 2001-09-09 04:46:40.000000	2001-09-09 04:46:40.000000
 DROP TABLE t1;
+create table t1 (t timestamp, i int, v timestamp as (t) virtual, key(v));
+insert t1 (t,i) values ('2006-03-01 23:59:59',1);
+update t1 set i = 2;
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+drop table t1;
+create table t1 (t timestamp, i int);
+create trigger tr1 before update on t1 for each row set @new:=new.t;
+insert t1 (t,i) values ('2006-03-01 23:59:59', 1);
+update t1 set i = 2;
+select if(@new = t, 'correct', 'wrong') from t1;
+if(@new = t, 'correct', 'wrong')
+correct
+drop table t1;
+create table t1 (i int, j int as (i));
+create trigger tr1 before update on t1 for each row set @new:=new.j;
+insert t1 (i) values (1);
+update t1, t1 as t2 set t1.i = 2;
+select if(@new = j, 'correct', 'wrong') from t1;
+if(@new = j, 'correct', 'wrong')
+correct
+drop table t1;
+create table t1 (a int, b varchar(20) default 'foo');
+insert t1 values (1,'bla'),(2, 'bar');
+select * from t1;
+a	b
+1	bla
+2	bar
+update t1 set b=default where a=1;
+select * from t1;
+a	b
+1	foo
+2	bar
+drop table t1;
+create table t1 (
+a int,
+b timestamp default '2010-10-10 10:10:10' on update now(),
+c varchar(100) default 'x');
+insert t1 (a) values (1),(2);
+select * from t1;
+a	b	c
+1	2010-10-10 10:10:10	x
+2	2010-10-10 10:10:10	x
+set timestamp=unix_timestamp('2011-11-11 11-11-11');
+update t1 set b=default, c=default(b) where a=1;
+select * from t1;
+a	b	c
+1	2010-10-10 10:10:10	2010-10-10 10:10:10
+2	2010-10-10 10:10:10	x
+drop table t1;
+set timestamp=default;