diff --git a/client/mysqltest.c b/client/mysqltest.c index 5bcd086672d..a223081cf3f 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -408,8 +408,10 @@ const char *command_names[]= "enable_rpl_parse", "disable_rpl_parse", "eval_result", + /* Enable/disable that the _query_ is logged to result file */ "enable_query_log", "disable_query_log", + /* Enable/disable that the _result_ from a query is logged to result file */ "enable_result_log", "disable_result_log", "server_start", @@ -789,8 +791,8 @@ err: check_result ds - content to be checked fname - name of file to check against - require_option - if set and check fails, the test will be aborted with the special - exit code "not supported test" + require_option - if set and check fails, the test will be aborted + with the special exit code "not supported test" RETURN VALUES error - the function will not return @@ -4288,7 +4290,17 @@ static void handle_error(const char *query, struct st_query *q, DBUG_ENTER("handle_error"); if (q->require_file) + { + /* + The query after a "--require" failed. This is fine as long the server + returned a valid reponse. Don't allow 2013 or 2006 to trigger an + abort_not_supported_test + */ + if (err_errno == CR_SERVER_LOST || + err_errno == CR_SERVER_GONE_ERROR) + die("require query '%s' failed: %d: %s", query, err_errno, err_error); abort_not_supported_test(); + } if (q->abort_on_error) die("query '%s' failed: %d: %s", query, err_errno, err_error); diff --git a/configure.in b/configure.in index 21bf9559245..34562ce7df1 100644 --- a/configure.in +++ b/configure.in @@ -1502,16 +1502,37 @@ else fi #---END: -# Check for dlopen, needed for user definable functions -# This must be checked after threads on AIX -# We only need this for mysqld, not for the clients. +# dlopen, dlerror +case "$with_mysqld_ldflags " in + + *"-static "*) + # No need to check for dlopen when mysqld is linked with + # -all-static or -static as it won't be able to load any functions. + # NOTE! It would be better if it was possible to test if dlopen + # can be used, but a good way to test it couldn't be found + + ;; + + *) + # Check for dlopen, needed for user definable functions + # This must be checked after threads on AIX + # We only need this for mysqld, not for the clients. + + my_save_LIBS="$LIBS" + LIBS="" + AC_CHECK_LIB(dl,dlopen) + LIBDL=$LIBS + LIBS="$my_save_LIBS" + AC_SUBST(LIBDL) + + my_save_LIBS="$LIBS" + LIBS="$LIBS $LIBDL" + AC_CHECK_FUNCS(dlopen dlerror) + LIBS="$my_save_LIBS" + + ;; +esac -my_save_LIBS="$LIBS" -LIBS="" -AC_CHECK_LIB(dl,dlopen) -LIBDL=$LIBS -LIBS="$my_save_LIBS" -AC_SUBST(LIBDL) # System characteristics case $SYSTEM_TYPE in @@ -1897,11 +1918,6 @@ then fi] ) -my_save_LIBS="$LIBS" -LIBS="$LIBS $LIBDL" -AC_CHECK_FUNCS(dlopen dlerror) -LIBS="$my_save_LIBS" - # Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments) ac_save_CXXFLAGS="$CXXFLAGS" AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style, diff --git a/mysql-test/include/have_udf.inc b/mysql-test/include/have_udf.inc new file mode 100644 index 00000000000..a22b2a52e61 --- /dev/null +++ b/mysql-test/include/have_udf.inc @@ -0,0 +1,12 @@ +# +# To check if the udf_example.so is available, +# try to load one function from it. +# +# +--require r/have_udf.require +--disable_abort_on_error +CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so'; +--disable_query_log +DROP FUNCTION metaphon; +--enable_query_log +--enable_abort_on_error diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0e6d6f32bdd..84b6d26e31a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1179,6 +1179,14 @@ sub environment_setup () { ($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : ""); } + # -------------------------------------------------------------------------- + # Add the path where mysqld will find udf_example.so + # -------------------------------------------------------------------------- + $ENV{'LD_LIBRARY_PATH'}= + "$glob_basedir/sql/.libs" . + ($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : ""); + + # -------------------------------------------------------------------------- # Also command lines in .opt files may contain env vars # -------------------------------------------------------------------------- diff --git a/mysql-test/r/have_udf.require b/mysql-test/r/have_udf.require new file mode 100644 index 00000000000..869d1b254fd --- /dev/null +++ b/mysql-test/r/have_udf.require @@ -0,0 +1 @@ +CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so'; diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result new file mode 100644 index 00000000000..ce9271224dc --- /dev/null +++ b/mysql-test/r/udf.result @@ -0,0 +1,87 @@ +drop table if exists t1; +CREATE FUNCTION metaphon RETURNS STRING 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 sequence RETURNS INTEGER SONAME "udf_example.so"; +CREATE FUNCTION lookup RETURNS STRING SONAME 'udf_example.so'; +CREATE FUNCTION reverse_lookup +RETURNS STRING SONAME 'udf_example.so'; +CREATE AGGREGATE FUNCTION avgcost +RETURNS REAL SONAME 'udf_example.so'; +select myfunc_double(); +ERROR HY000: myfunc_double must have at least one argument +select myfunc_double(1); +myfunc_double(1) +49.00 +select myfunc_double(78654); +myfunc_double(78654) +54.00 +select myfunc_nonexist(); +ERROR 42000: FUNCTION test.myfunc_nonexist does not exist +select myfunc_int(); +myfunc_int() +0 +select lookup(); +ERROR HY000: Wrong arguments to lookup; Use the source +select lookup("127.0.0.1"); +lookup("127.0.0.1") +127.0.0.1 +select lookup(127,0,0,1); +ERROR HY000: Wrong arguments to lookup; Use the source +select lookup("localhost"); +lookup("localhost") +127.0.0.1 +select reverse_lookup(); +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); +select reverse_lookup("localhost"); +reverse_lookup("localhost") +NULL +select avgcost(); +ERROR HY000: wrong number of arguments: AVGCOST() requires two arguments +select avgcost(100,23.76); +ERROR HY000: wrong argument type: AVGCOST() requires an INT and a REAL +create table t1(sum int, price float(24)); +insert into t1 values(100, 50.00), (100, 100.00); +select avgcost(sum, price) from t1; +avgcost(sum, price) +75.0000 +delete from t1; +insert into t1 values(100, 54.33), (200, 199.99); +select avgcost(sum, price) from t1; +avgcost(sum, price) +151.4367 +drop table t1; +select metaphon('hello'); +metaphon('hello') +HL +CREATE PROCEDURE `XXX1`(in testval varchar(10)) +begin +select metaphon(testval); +end// +call XXX1('hello'); +metaphon(testval) +HL +drop procedure xxx1; +CREATE PROCEDURE `XXX2`() +begin +declare testval varchar(10); +set testval = 'hello'; +select metaphon(testval); +end// +call XXX2(); +metaphon(testval) +HL +drop procedure xxx2; +DROP FUNCTION metaphon; +DROP FUNCTION myfunc_double; +DROP FUNCTION myfunc_nonexist; +ERROR 42000: FUNCTION test.myfunc_nonexist does not exist +DROP FUNCTION myfunc_int; +DROP FUNCTION sequence; +DROP FUNCTION lookup; +DROP FUNCTION reverse_lookup; +DROP FUNCTION avgcost; diff --git a/mysql-test/t/udf.test b/mysql-test/t/udf.test new file mode 100644 index 00000000000..c9f22cf410b --- /dev/null +++ b/mysql-test/t/udf.test @@ -0,0 +1,108 @@ +--source include/have_udf.inc +# +# To run this tests the "sql/udf_example.cc" need to be compiled into +# udf_example.so and LD_LIBRARY_PATH should be setup to point out where +# the library are. +# + + +--disable_warnings +drop table if exists t1; +--enable_warnings + +# +# Create the example functions from udf_example +# + +CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so'; +CREATE FUNCTION myfunc_double RETURNS REAL SONAME 'udf_example.so'; + +--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 sequence RETURNS INTEGER SONAME "udf_example.so"; +CREATE FUNCTION lookup RETURNS STRING SONAME 'udf_example.so'; +CREATE FUNCTION reverse_lookup + RETURNS STRING SONAME 'udf_example.so'; +CREATE AGGREGATE FUNCTION avgcost + RETURNS REAL SONAME 'udf_example.so'; + +--error 0 +select myfunc_double(); +select myfunc_double(1); +select myfunc_double(78654); +--error 1305 +select myfunc_nonexist(); +select myfunc_int(); +--error 0 +select lookup(); +select lookup("127.0.0.1"); +--error 0 +select lookup(127,0,0,1); +select lookup("localhost"); +--error 0 +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); +--enable_result_log + +select reverse_lookup("localhost"); +--error 0 +select avgcost(); +--error 0 +select avgcost(100,23.76); +create table t1(sum int, price float(24)); +insert into t1 values(100, 50.00), (100, 100.00); +select avgcost(sum, price) from t1; +delete from t1; +insert into t1 values(100, 54.33), (200, 199.99); +select avgcost(sum, price) from t1; +drop table t1; + +#------------------------------------------------------------------------ +# BUG#17261 Passing a variable from a stored procedure to UDF crashes mysqld +#------------------------------------------------------------------------ + +select metaphon('hello'); + +delimiter //; +CREATE PROCEDURE `XXX1`(in testval varchar(10)) +begin +select metaphon(testval); +end// +delimiter ;// + +call XXX1('hello'); +drop procedure xxx1; + +delimiter //; +CREATE PROCEDURE `XXX2`() +begin +declare testval varchar(10); +set testval = 'hello'; +select metaphon(testval); +end// +delimiter ;// + +call XXX2(); +drop procedure xxx2; + + +# +# Drop the example functions from udf_example +# + +DROP FUNCTION metaphon; +DROP FUNCTION myfunc_double; +--error ER_SP_DOES_NOT_EXIST +DROP FUNCTION myfunc_nonexist; +DROP FUNCTION myfunc_int; +DROP FUNCTION sequence; +DROP FUNCTION lookup; +DROP FUNCTION reverse_lookup; +DROP FUNCTION avgcost; + diff --git a/sql/Makefile.am b/sql/Makefile.am index b0824110792..8545cd7d75a 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -174,10 +174,11 @@ ha_ndbcluster_binlog.o:ha_ndbcluster_binlog.cc ha_ndbcluster_binlog.h handler.o: handler.cc ha_ndbcluster.h $(CXXCOMPILE) @ndbcluster_includes@ $(CXXFLAGS) -c $< -# For testing of udf_example.so; Works on platforms with gcc -# (This is not part of our build process but only provided as an example) -udf_example.so: udf_example.cc - $(CXXCOMPILE) -shared -o $@ $< +# For testing of udf_example.so +noinst_LTLIBRARIES= udf_example.la +udf_example_la_SOURCES= udf_example.cc +udf_example_la_LDFLAGS= -module -rpath $(pkglibdir) + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/sql/item_func.cc b/sql/item_func.cc index 34fd07e5a16..7937f4093f2 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2608,7 +2608,7 @@ udf_handler::fix_fields(THD *thd, Item_result_field *func, switch(arguments[i]->type()) { case Item::STRING_ITEM: // Constant string ! { - String *res=arguments[i]->val_str((String *) 0); + String *res=arguments[i]->val_str(&buffers[i]); if (arguments[i]->null_value) continue; f_args.args[i]= (char*) res->ptr(); diff --git a/sql/udf_example.cc b/sql/udf_example.cc index 35833e63fab..e6d272d9085 100644 --- a/sql/udf_example.cc +++ b/sql/udf_example.cc @@ -113,6 +113,8 @@ */ #ifdef STANDARD +/* STANDARD is defined, don't use any mysql functions */ +#include #include #include #ifdef __WIN__ @@ -125,10 +127,10 @@ typedef long long longlong; #else #include #include +#include // To get strmov() #endif #include -#include -#include // To get strmov() +#include static pthread_mutex_t LOCK_hostname; @@ -290,8 +292,8 @@ char *metaphon(UDF_INIT *initid, UDF_ARGS *args, char *result, for (n = ntrans + 1, n_end = ntrans + sizeof(ntrans)-2; word != w_end && n < n_end; word++ ) - if ( my_isalpha ( &my_charset_latin1, *word )) - *n++ = my_toupper ( &my_charset_latin1, *word ); + if ( isalpha ( *word )) + *n++ = toupper ( *word ); if ( n == ntrans + 1 ) /* return empty string if 0 bytes */ { @@ -519,7 +521,7 @@ my_bool myfunc_double_init(UDF_INIT *initid, UDF_ARGS *args, char *message) { if (!args->arg_count) { - strcpy(message,"myfunc_double must have at least on argument"); + strcpy(message,"myfunc_double must have at least one argument"); return 1; } /*