diff options
| author | unknown <dlenev@mysql.com> | 2005-07-13 15:08:13 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-07-13 15:08:13 +0400 |
| commit | 119bf9f8e1670a3b0c6b16b7b6e0dfb0ff7e9efc (patch) | |
| tree | 27047290ecb242a0a2f69b3875b188156034bba9 /mysql-test/r/sp-error.result | |
| parent | bcaf84b030714151a8533cdf5c34b55abd6bfcf1 (diff) | |
| parent | ad1a4b3f355b67e9169770dc423b095d0426fe6b (diff) | |
| download | mariadb-git-119bf9f8e1670a3b0c6b16b7b6e0dfb0ff7e9efc.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
mysql-test/r/sp-error.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/share/errmsg.txt:
Manual merge.
sql/sp.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/sp-error.result')
| -rw-r--r-- | mysql-test/r/sp-error.result | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index 18acd2e4c03..13f46e507ba 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -286,6 +286,19 @@ ERROR 42000: OUT or INOUT argument 2 for routine test.p is not a variable call p(42, @tmp_y, 43)| ERROR 42000: OUT or INOUT argument 3 for routine test.p is not a variable drop procedure p| +create procedure p() begin end| +lock table t1 read| +call p()| +unlock tables| +drop procedure p| +lock tables t1 read, mysql.proc write| +ERROR HY000: You can't combine write-locking of system 'mysql.proc' table with other tables +lock tables mysql.proc write, mysql.user write| +ERROR HY000: You can't combine write-locking of system 'mysql.proc' table with other tables +lock tables t1 read, mysql.proc read| +unlock tables| +lock tables mysql.proc write| +unlock tables| create procedure bug1965() begin declare c cursor for select val from t1 order by valname; @@ -477,7 +490,7 @@ begin select * from t1; end| lock table t1 read| -call bug9566()| +alter procedure bug9566 comment 'Some comment'| ERROR HY000: Table 'proc' was not locked with LOCK TABLES unlock tables| drop procedure bug9566| |