diff options
| author | unknown <dlenev@mockturtle.local> | 2006-11-13 11:29:40 +0300 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2006-11-13 11:29:40 +0300 |
| commit | 458fb082d092c7df3f64398f324a05a5b13f0082 (patch) | |
| tree | 671fbae62f002a6fe83dac3f3cde909772b8dc8c /mysql-test/r/trigger.result | |
| parent | ce963d0c8e3243b558ea54c11e8c5824b8dcf3b8 (diff) | |
| parent | 1031c460de5bd4b1014614e8871393eebd0a51bc (diff) | |
| download | mariadb-git-458fb082d092c7df3f64398f324a05a5b13f0082.tar.gz | |
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/trigger.result')
| -rw-r--r-- | mysql-test/r/trigger.result | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index 52123885772..64966b9a3eb 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -1241,4 +1241,19 @@ i j 2 2 13 13 drop table t1; +drop table if exists t1; +drop function if exists f1; +create table t1 (i int); +create function f1() returns int return 10; +create trigger t1_bi before insert on t1 for each row set @a:= f1() + 10; +insert into t1 values (); +select @a; +@a +20 +insert into t1 values (); +select @a; +@a +20 +drop table t1; +drop function f1; End of 5.0 tests |