diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-09-27 11:46:29 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-09-27 11:46:29 +0400 |
| commit | afedaa108977d8de05af6fd5915d4a86bdbe91ff (patch) | |
| tree | e11d30689b96899d873049f1c2705143b35fc810 /mysql-test/r | |
| parent | bde596273895f1fbc3b880f9b63205151f314a46 (diff) | |
| parent | d4933af87efb8f7b01d48c4ba46ff196f73a193f (diff) | |
| download | mariadb-git-afedaa108977d8de05af6fd5915d4a86bdbe91ff.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21414
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -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 854935b071b..b08ce0528a3 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -5394,4 +5394,12 @@ 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| drop table t1,t2; |