diff options
| author | unknown <kostja@bodhi.local> | 2006-08-02 21:54:10 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-08-02 21:54:10 +0400 |
| commit | e44e344cac60606be0fe13373b6166688e449244 (patch) | |
| tree | 3241b2854c0aa8cee9250880ef30eb407e84e7ec /mysql-test/r/sp.result | |
| parent | a0efaba36344800e522ba03d373ab2450841852d (diff) | |
| parent | 1cf65f311dbf09615bea443b041a78db34d7e2ea (diff) | |
| download | mariadb-git-e44e344cac60606be0fe13373b6166688e449244.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/sp.result:
Manual merge.
mysql-test/r/udf.result:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
mysql-test/t/udf.test:
Manual merge.
Diffstat (limited to 'mysql-test/r/sp.result')
| -rw-r--r-- | mysql-test/r/sp.result | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 38594419e88..88a860d6c8a 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -5222,6 +5222,25 @@ CHARSET(p3) COLLATION(p3) greek greek_general_ci use test| DROP DATABASE mysqltest1| +drop procedure if exists bug19862| +CREATE TABLE t11 (a INT)| +CREATE TABLE t12 (a INT)| +CREATE FUNCTION bug19862(x INT) RETURNS INT +BEGIN +INSERT INTO t11 VALUES (x); +RETURN x+1; +END| +INSERT INTO t12 VALUES (1), (2)| +SELECT bug19862(a) FROM t12 ORDER BY 1| +bug19862(a) +2 +3 +SELECT * FROM t11| +a +1 +2 +DROP TABLE t11, t12| +DROP FUNCTION bug19862| drop table if exists t3| drop database if exists mysqltest1| create table t3 (a int)| |