diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-27 17:30:56 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-27 17:30:56 +0200 |
| commit | 577ae18f59bb4f569c6d59de61a9590124fb352d (patch) | |
| tree | 666273a5f8d4ca74cba0bc9678c2b8f731244144 /mysql-test/r/trigger.result | |
| parent | 04ef66f41ece17c8f7bde740418ea4f504785eb7 (diff) | |
| parent | 1c351ee6a1c78e4ac9d00e81571ed25bf6ca177b (diff) | |
| download | mariadb-git-577ae18f59bb4f569c6d59de61a9590124fb352d.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
mysql-test/mysql-test-run.pl:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/trigger.result:
Manual merge
mysql-test/t/trigger.test:
Manual merge
Diffstat (limited to 'mysql-test/r/trigger.result')
| -rw-r--r-- | mysql-test/r/trigger.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index a5cec65b454..6a689437482 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -949,7 +949,7 @@ insert into t1 values create function f2() returns int return (select max(b) from t2); insert into t2 select a, f2() from t1; load data infile '../std_data_ln/words.dat' into table t1 (a) set b:= f1(); -drop tables t1, t2; +drop table t1, t2; drop function f1; drop function f2; create table t1(i int not null, j int not null, n numeric(15,2), primary key(i,j)); |