mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk@192.168.21.1:mysql-5.0

Browse source 
into mysql.com:/home/hf/work/mysql-5.0.17756
This commit is contained in:
holyfoot@mysql.com 2006-04-12 14:50:26 +05:00
commit ebcafb887f
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/sp_notembedded.result
View file

@ -1,3 +1,4 @@
drop table if exists t1,t3;
drop procedure if exists bug4902| drop procedure if exists bug4902|
create procedure bug4902() create procedure bug4902()
begin begin
@ -204,3 +205,4 @@ drop procedure bug10100pv|
drop procedure bug10100pd| drop procedure bug10100pd|
drop procedure bug10100pc| drop procedure bug10100pc|
drop view v1| drop view v1|
drop table t3;

5
mysql-test/t/sp_notembedded.test
View file

@ -1,6 +1,10 @@
# Can't test with embedded server # Can't test with embedded server
-- source include/not_embedded.inc -- source include/not_embedded.inc
--sleep 2
--disable_warnings
drop table if exists t1,t3;
--enable_warnings
delimiter |; delimiter |;
# #
@ -260,3 +264,4 @@ drop procedure bug10100pc|
drop view v1| drop view v1|
delimiter ;| delimiter ;|
drop table t3;