Commit 4fb90983 authored by unknown's avatar unknown

Update test results for udf

Remove STANDARD  define when compile udf_example.so


mysql-test/r/udf.result:
  Update results
mysql-test/t/udf.test:
  Update test try to create, use and drop a non existing function
  Disable the result from "reverse_lookup" as it is config dependent
sql/Makefile.am:
  Remove the "STANDARD" define when compiling udf_example.so
parent f53afa23
drop table if exists t1; drop table if exists t1;
CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so'; CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';
CREATE FUNCTION myfunc_double RETURNS REAL SONAME 'udf_example.so'; CREATE FUNCTION myfunc_double RETURNS REAL SONAME 'udf_example.so';
CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME 'udf_example.so';
ERROR HY000: Can't find function 'myfunc_nonexist' in library
CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME 'udf_example.so'; CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME 'udf_example.so';
ERROR HY000: Can't find function 'myfunc_int_init' in library
CREATE FUNCTION sequence RETURNS INTEGER SONAME "udf_example.so"; CREATE FUNCTION sequence RETURNS INTEGER SONAME "udf_example.so";
CREATE FUNCTION lookup RETURNS STRING SONAME 'udf_example.so'; CREATE FUNCTION lookup RETURNS STRING SONAME 'udf_example.so';
CREATE FUNCTION reverse_lookup CREATE FUNCTION reverse_lookup
...@@ -17,8 +18,11 @@ myfunc_double(1) ...@@ -17,8 +18,11 @@ myfunc_double(1)
select myfunc_double(78654); select myfunc_double(78654);
myfunc_double(78654) myfunc_double(78654)
54.00 54.00
select myfunc_nonexist();
ERROR 42000: FUNCTION test.myfunc_nonexist does not exist
select myfunc_int(); select myfunc_int();
ERROR 42000: FUNCTION test.myfunc_int does not exist myfunc_int()
0
select lookup(); select lookup();
ERROR HY000: Wrong arguments to lookup; Use the source ERROR HY000: Wrong arguments to lookup; Use the source
select lookup("127.0.0.1"); select lookup("127.0.0.1");
...@@ -32,11 +36,7 @@ lookup("localhost") ...@@ -32,11 +36,7 @@ lookup("localhost")
select reverse_lookup(); select reverse_lookup();
ERROR HY000: Wrong number of arguments to reverse_lookup; Use the source ERROR HY000: Wrong number of arguments to reverse_lookup; Use the source
select reverse_lookup("127.0.0.1"); select reverse_lookup("127.0.0.1");
reverse_lookup("127.0.0.1")
localhost
select reverse_lookup(127,0,0,1); select reverse_lookup(127,0,0,1);
reverse_lookup(127,0,0,1)
localhost
select reverse_lookup("localhost"); select reverse_lookup("localhost");
reverse_lookup("localhost") reverse_lookup("localhost")
NULL NULL
...@@ -78,8 +78,9 @@ HL ...@@ -78,8 +78,9 @@ HL
drop procedure xxx2; drop procedure xxx2;
DROP FUNCTION metaphon; DROP FUNCTION metaphon;
DROP FUNCTION myfunc_double; DROP FUNCTION myfunc_double;
DROP FUNCTION myfunc_nonexist;
ERROR 42000: FUNCTION test.myfunc_nonexist does not exist
DROP FUNCTION myfunc_int; DROP FUNCTION myfunc_int;
ERROR 42000: FUNCTION test.myfunc_int does not exist
DROP FUNCTION sequence; DROP FUNCTION sequence;
DROP FUNCTION lookup; DROP FUNCTION lookup;
DROP FUNCTION reverse_lookup; DROP FUNCTION reverse_lookup;
......
...@@ -17,9 +17,8 @@ drop table if exists t1; ...@@ -17,9 +17,8 @@ drop table if exists t1;
CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so'; CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';
CREATE FUNCTION myfunc_double RETURNS REAL SONAME 'udf_example.so'; CREATE FUNCTION myfunc_double RETURNS REAL SONAME 'udf_example.so';
# myfunc_int does not have a myfunc_int_init function and can
# not be loaded unless server is started with --allow-suspicious-udfs
--error ER_CANT_FIND_DL_ENTRY --error ER_CANT_FIND_DL_ENTRY
CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME 'udf_example.so';
CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME 'udf_example.so'; CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME 'udf_example.so';
CREATE FUNCTION sequence RETURNS INTEGER SONAME "udf_example.so"; CREATE FUNCTION sequence RETURNS INTEGER SONAME "udf_example.so";
CREATE FUNCTION lookup RETURNS STRING SONAME 'udf_example.so'; CREATE FUNCTION lookup RETURNS STRING SONAME 'udf_example.so';
...@@ -33,6 +32,7 @@ select myfunc_double(); ...@@ -33,6 +32,7 @@ select myfunc_double();
select myfunc_double(1); select myfunc_double(1);
select myfunc_double(78654); select myfunc_double(78654);
--error 1305 --error 1305
select myfunc_nonexist();
select myfunc_int(); select myfunc_int();
--error 0 --error 0
select lookup(); select lookup();
...@@ -42,9 +42,14 @@ select lookup(127,0,0,1); ...@@ -42,9 +42,14 @@ select lookup(127,0,0,1);
select lookup("localhost"); select lookup("localhost");
--error 0 --error 0
select reverse_lookup(); select reverse_lookup();
# These two functions should return "localhost", but it's
# depending on configuration, so just call them and don't log the result
--disable_result_log
select reverse_lookup("127.0.0.1"); select reverse_lookup("127.0.0.1");
--error 0
select reverse_lookup(127,0,0,1); select reverse_lookup(127,0,0,1);
--enable_result_log
select reverse_lookup("localhost"); select reverse_lookup("localhost");
--error 0 --error 0
select avgcost(); select avgcost();
...@@ -94,6 +99,7 @@ drop procedure xxx2; ...@@ -94,6 +99,7 @@ drop procedure xxx2;
DROP FUNCTION metaphon; DROP FUNCTION metaphon;
DROP FUNCTION myfunc_double; DROP FUNCTION myfunc_double;
--error ER_SP_DOES_NOT_EXIST --error ER_SP_DOES_NOT_EXIST
DROP FUNCTION myfunc_nonexist;
DROP FUNCTION myfunc_int; DROP FUNCTION myfunc_int;
DROP FUNCTION sequence; DROP FUNCTION sequence;
DROP FUNCTION lookup; DROP FUNCTION lookup;
......
...@@ -156,7 +156,6 @@ lex_hash.h: gen_lex_hash$(EXEEXT) ...@@ -156,7 +156,6 @@ lex_hash.h: gen_lex_hash$(EXEEXT)
# For testing of udf_example.so # For testing of udf_example.so
noinst_LTLIBRARIES= udf_example.la noinst_LTLIBRARIES= udf_example.la
udf_example_la_SOURCES= udf_example.cc udf_example_la_SOURCES= udf_example.cc
udf_example_la_CXXFLAGS= -DSTANDARD
udf_example_la_LDFLAGS= -module -rpath $(pkglibdir) udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment