diff options
| author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-16 20:47:08 -0600 |
|---|---|---|
| committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-16 20:47:08 -0600 |
| commit | 84984f9111bf49418782eaa21b2d8cde41998eba (patch) | |
| tree | 87f5726747166bd6e5b9054924de1bf12f852fb8 /mysql-test/r/udf.result | |
| parent | 1dc0efc606bf7f66402e7f9728b7e4a0a1fd82ec (diff) | |
| download | mariadb-git-84984f9111bf49418782eaa21b2d8cde41998eba.tar.gz | |
Manual merge of 5.0-runtime to 5.1-runtime
mysql-test/r/sp-error.result:
Manual merge
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
sql/item_create.cc:
Manual merge
sql/sp_head.cc:
Manual merge
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'mysql-test/r/udf.result')
| -rw-r--r-- | mysql-test/r/udf.result | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index f1e47905f5d..da27a71c1a1 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -95,10 +95,10 @@ FR DROP TABLE bug19904; CREATE DEFINER=CURRENT_USER() FUNCTION should_not_parse RETURNS STRING SONAME "should_not_parse.so"; -ERROR HY000: Incorrect usage of SONAME and DEFINER +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 CREATE DEFINER=someone@somewhere FUNCTION should_not_parse RETURNS STRING SONAME "should_not_parse.so"; -ERROR HY000: Incorrect usage of SONAME and DEFINER +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 create table t1(f1 int); insert into t1 values(1),(2); explain select myfunc_int(f1) from t1 order by 1; @@ -214,7 +214,7 @@ DROP FUNCTION IF EXISTS metaphon; CREATE FUNCTION metaphon(a int) RETURNS int return 0; CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; -ERROR HY000: Function 'metaphon' already exists +DROP FUNCTION metaphon; DROP FUNCTION metaphon; CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; CREATE FUNCTION metaphon(a int) RETURNS int @@ -334,6 +334,13 @@ Qcache_queries_in_cache 0 drop table t1; drop function metaphon; set GLOBAL query_cache_size=default; +DROP DATABASE IF EXISTS mysqltest; +CREATE DATABASE mysqltest; +USE mysqltest; +DROP DATABASE mysqltest; +CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; +DROP FUNCTION metaphon; +USE test; CREATE TABLE const_len_bug ( str_const varchar(4000), result1 varchar(4000), |