diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-09-27 12:22:16 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-09-27 12:22:16 +0400 |
| commit | 7c59445af08270ae3e34830b1d30a974f0ea4c4c (patch) | |
| tree | 4058c075ec977494b07adde59db20ff100e16dea /mysql-test/r/sp.result | |
| parent | 4e5b560dd80a54a462d5f98b5f6de28642144f55 (diff) | |
| parent | d4933af87efb8f7b01d48c4ba46ff196f73a193f (diff) | |
| download | mariadb-git-7c59445af08270ae3e34830b1d30a974f0ea4c4c.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21414
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/r/sp.result:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
Diffstat (limited to 'mysql-test/r/sp.result')
| -rw-r--r-- | mysql-test/r/sp.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index fb40b52475b..26dfb463aef 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -5379,5 +5379,13 @@ Procedure sql_mode Create Procedure bug21416 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug21416`() show create procedure bug21416 drop procedure bug21416| +DROP PROCEDURE IF EXISTS bug21414| +CREATE PROCEDURE bug21414() SELECT 1| +FLUSH TABLES WITH READ LOCK| +DROP PROCEDURE bug21414| +ERROR HY000: Can't execute the query because you have a conflicting read lock +UNLOCK TABLES| +The following should succeed. +DROP PROCEDURE bug21414| End of 5.0 tests drop table t1,t2; |