diff options
| author | pem@mysql.com <> | 2005-07-11 12:46:42 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2005-07-11 12:46:42 +0200 |
| commit | 6f54e27e5e73f01168eaa7eece1f8d6526d35bb9 (patch) | |
| tree | d67cd58e2977dc6b30f461bf33e0e344d16d7446 /mysql-test/t/sp.test | |
| parent | 41acf1ce617996a79b9e2276706e9dcbddf756a9 (diff) | |
| parent | 054e0e171200bd8db51f17e0ff174bcc7c9aaec6 (diff) | |
| download | mariadb-git-6f54e27e5e73f01168eaa7eece1f8d6526d35bb9.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
Diffstat (limited to 'mysql-test/t/sp.test')
| -rw-r--r-- | mysql-test/t/sp.test | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 2a014e3c4cb..4df49c5f934 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -1283,7 +1283,8 @@ select * from v1| # views and functions ? create function f1() returns int return (select sum(data) from t1) + (select sum(data) from v1)| -# FIXME All these just exceed file limit for me :) +# This queries will crash server because we can't use LEX in +# reenterable fashion yet. Patch disabling recursion will heal this. #select f1()| #select * from v1| #select * from v2| @@ -1328,15 +1329,12 @@ select * from v2| select * from v1| # These should not work as we have too little instances of tables locked --error 1100 -select * from v1, v2| +select * from v1, t1| --error 1100 select f4()| unlock tables| -# TODO We also should test integration with triggers - - # Cleanup drop function f0| drop function f1| |