diff options
| author | unknown <kaa@polly.local> | 2007-02-20 22:23:51 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-02-20 22:23:51 +0300 |
| commit | 96753a29eddac927b78a4493b06dfd0c5878f13a (patch) | |
| tree | 410e3f7acdfa8cbc2bc2fb2909d17b0b747261ef /mysql-test/r/sp.result | |
| parent | 92584188d41b7c9b8f95d60eeb5c9fad07a2ea93 (diff) | |
| parent | db36a2aa5daf6b8490f04bd08d1a9a7ea0758a30 (diff) | |
| download | mariadb-git-96753a29eddac927b78a4493b06dfd0c5878f13a.tar.gz | |
Merge polly.local:/tmp/maint/bug25137/my50-bug25137
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
mysql-test/r/sp.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/r/mysqlbinlog.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/sp.result')
| -rw-r--r-- | mysql-test/r/sp.result | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 8e3c057cc62..62fd74adf91 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -4697,20 +4697,6 @@ Handler Inner drop procedure bug15011| drop table t3| -drop function if exists bug17615| -create table t3 (a varchar(256) unicode)| -create function bug17615() returns varchar(256) unicode -begin -declare tmp_res varchar(256) unicode; -set tmp_res= 'foo string'; -return tmp_res; -end| -insert into t3 values(bug17615())| -select * from t3| -a -foo string -drop function bug17615| -drop table t3| drop procedure if exists bug17476| create table t3 ( d date )| insert into t3 values |