diff options
| author | unknown <andrey@example.com> | 2006-09-27 22:25:23 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-09-27 22:25:23 +0200 |
| commit | ca48feceee0737619aed37232df3ba8811a8394d (patch) | |
| tree | c7b3157c76b879cece25cc6cb05942519a25764f /mysql-test/r | |
| parent | afedaa108977d8de05af6fd5915d4a86bdbe91ff (diff) | |
| parent | fcb8687ad98ea57bfe8d12d36af1432561054565 (diff) | |
| download | mariadb-git-ca48feceee0737619aed37232df3ba8811a8394d.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into example.com:/work/mysql-5.0-runtime
mysql-test/t/sp.test:
Auto merged
sql/sp.cc:
Auto merged
mysql-test/r/sp.result:
manual merge
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/sp.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index b08ce0528a3..b773bee1ac8 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -5402,4 +5402,11 @@ ERROR HY000: Can't execute the query because you have a conflicting read lock UNLOCK TABLES| The following should succeed. DROP PROCEDURE bug21414| +set names utf8| +drop database if exists това_е_дълго_име_за_база_данни_нали| +create database това_е_дълго_име_за_база_данни_нали| +INSERT INTO mysql.proc VALUES ('това_е_дълго_име_за_база_данни_нали','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','PROCEDURE','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','SQL','CONTAINS_SQL','NO','DEFINER','','','bad_body','root@localhost',now(), now(),'','')| +call това_е_дълго_име_за_база_данни_нали.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго()| +ERROR HY000: Failed to load routine това_е_дълго_име_за_база_данни_нали.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6) +drop database това_е_дълго_име_за_база_данни_нали| drop table t1,t2; |