diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-31 12:09:59 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-31 12:09:59 +0500 |
| commit | 6312042ca7575ecbc2839cc07e6ba21a9c4ae56d (patch) | |
| tree | 945e9b5bc53933eaf05007cb042ff06b2ea86aaf /mysql-test/r/sp.result | |
| parent | 03adaa85c4a95480661688f3af251ef4fa05c83f (diff) | |
| parent | 33fc4ad4e124413ef617a1a073bb50135f6a12af (diff) | |
| download | mariadb-git-6312042ca7575ecbc2839cc07e6ba21a9c4ae56d.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp.result:
Merge with 5.0-opt.
mysql-test/t/sp.test:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test/r/sp.result')
| -rw-r--r-- | mysql-test/r/sp.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index a17c3e4492e..4ac88b995dd 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -6378,6 +6378,17 @@ Level Code Message use test; drop procedure sp_bug29050; drop table t1; +SET NAMES latin1; +CREATE PROCEDURE p1() +BEGIN +DECLARE бвд INT; +SELECT бвд; +END| +CALL p1(); +бвд +NULL +SET NAMES default; +DROP PROCEDURE p1; drop procedure if exists proc_25411_a; drop procedure if exists proc_25411_b; drop procedure if exists proc_25411_c; |