mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

manual merge

Browse source
This commit is contained in:
konstantin@mysql.com 2005-01-13 18:15:58 +03:00
parent a676498977
commit 443cafc232
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mysql-test/t/ps_1general.test
View file

@ -11,6 +11,10 @@
--disable_warnings --disable_warnings
drop table if exists t5, t6, t7, t8; drop table if exists t5, t6, t7, t8;
drop database if exists mysqltest ; 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 --enable_warnings
--disable_query_log --disable_query_log
@ -474,9 +478,7 @@ prepare stmt1 from ' handler t1 open ';
## commit/rollback ## commit/rollback
--error 1295
prepare stmt3 from ' commit ' ; prepare stmt3 from ' commit ' ;
--error 1295
prepare stmt3 from ' rollback ' ; prepare stmt3 from ' rollback ' ;
@ -577,11 +579,8 @@ execute stmt3 using @arg00;
select m from t3; select m from t3;
drop table t3; drop table t3;
--error 1295
prepare stmt3 from ' create index t2_idx on t2(b) '; prepare stmt3 from ' create index t2_idx on t2(b) ';
--error 1295
prepare stmt3 from ' drop index t2_idx on t2 ' ; prepare stmt3 from ' drop index t2_idx on t2 ' ;
--error 1295
prepare stmt3 from ' alter table t2 drop primary key '; prepare stmt3 from ' alter table t2 drop primary key ';
## RENAME TABLE ## RENAME TABLE