diff options
| author | unknown <konstantin@mysql.com> | 2005-01-13 18:15:58 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-01-13 18:15:58 +0300 |
| commit | 21dce6253405598e5c6f9c669ee6ef5e550c2ca3 (patch) | |
| tree | 983199ff452c5d7f751f15d8ba4e82bbb6f4bc8c | |
| parent | 9c4824af7c1985d7d439f523aa8a85402cde9808 (diff) | |
| download | mariadb-git-21dce6253405598e5c6f9c669ee6ef5e550c2ca3.tar.gz | |
manual merge
| -rw-r--r-- | mysql-test/t/ps_1general.test | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index d9cc9de6ff1..4b55593fde5 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -11,6 +11,10 @@ --disable_warnings drop table if exists t5, t6, t7, t8; drop database if exists mysqltest ; +# Cleanup from other tests +drop database if exists testtets; +drop table if exists t1Aa,t2Aa,v1Aa,v2Aa; +drop view if exists t1Aa,t2Aa,v1Aa,v2Aa; --enable_warnings --disable_query_log @@ -474,9 +478,7 @@ prepare stmt1 from ' handler t1 open '; ## commit/rollback ---error 1295 prepare stmt3 from ' commit ' ; ---error 1295 prepare stmt3 from ' rollback ' ; @@ -577,11 +579,8 @@ execute stmt3 using @arg00; select m from t3; drop table t3; ---error 1295 prepare stmt3 from ' create index t2_idx on t2(b) '; ---error 1295 prepare stmt3 from ' drop index t2_idx on t2 ' ; ---error 1295 prepare stmt3 from ' alter table t2 drop primary key '; ## RENAME TABLE |