Commit 2304a588 authored by unknown's avatar unknown
Browse files

merging 


mysql-test/t/sp_notembedded.test:
  Auto merged
parents 83c8e2c9 f4e85811

mysql-test/r/sp_notembedded.result

+1 −0
Original line number Diff line number Diff line 
drop table if exists t1,t3;

drop procedure if exists bug4902|

create procedure bug4902()

begin

mysql-test/t/sp_notembedded.test

+5 −0
Original line number Diff line number Diff line 
# Can't test with embedded server

-- source include/not_embedded.inc



--sleep 2

--disable_warnings

drop table if exists t1,t3;

--enable_warnings

delimiter |;



#
@@ -261,3 +265,4 @@ drop view v1| 
drop table t3|



delimiter ;|

drop table t3;