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 | 36261a96fbedb08c95e061a6f782865ff73cf30c (patch) | |
| tree | 666273a5f8d4ca74cba0bc9678c2b8f731244144 /mysql-test/t/trigger.test | |
| parent | 66b56724ffb0a8265445b91f50724076cfdeebf2 (diff) | |
| parent | 2e4d7bd8baf3147a262302a02ceb24ff37d14811 (diff) | |
| download | mariadb-git-36261a96fbedb08c95e061a6f782865ff73cf30c.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/t/trigger.test')
| -rw-r--r-- | mysql-test/t/trigger.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index ae05d70bf67..00c85a650d1 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -1111,7 +1111,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; |