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/udf.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/udf.result')
| -rw-r--r-- | mysql-test/r/udf.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index d71e7ef2ce7..8e37cca6aa9 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -99,6 +99,12 @@ ERROR HY000: Incorrect usage of SONAME and DEFINER CREATE DEFINER=someone@somewhere FUNCTION should_not_parse RETURNS STRING SONAME "should_not_parse.so"; ERROR HY000: Incorrect usage of SONAME and DEFINER +create table t1(f1 int); +insert into t1 values(1),(2); +explain select myfunc_int(f1) from t1 order by 1; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort +drop table t1; End of 5.0 tests. DROP FUNCTION metaphon; DROP FUNCTION myfunc_double; |