Commit 21dce625 authored by unknown's avatar unknown
Browse files

manual merge

parent 9c4824af
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -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