diff options
| -rw-r--r-- | sql/sql_parse.cc | 2 | ||||
| -rw-r--r-- | sql/udf_example.cc | 3 | ||||
| -rw-r--r-- | tests/udf_test | 2 | ||||
| -rw-r--r-- | tests/udf_test.res | 12 |
4 files changed, 7 insertions, 12 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 103dde10814..93f5bf99ebe 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2939,8 +2939,6 @@ mysql_execute_command(THD *thd) break; #ifdef HAVE_DLOPEN sp_head *sph= sp_find_function(thd, &lex->udf.name); - // close & unlock table opened by sp_find_function - close_thread_tables(thd); if (sph) { net_printf(thd, ER_UDF_EXISTS, lex->udf.name.str); diff --git a/sql/udf_example.cc b/sql/udf_example.cc index 397a5051aa2..6748be5a06f 100644 --- a/sql/udf_example.cc +++ b/sql/udf_example.cc @@ -991,7 +991,6 @@ avgcost( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* error ) extern "C" { my_bool myfunc_argument_name_init(UDF_INIT *initid, UDF_ARGS *args, char *message); -void myfunc_argument_name_deinit(UDF_INIT *initid); char *myfunc_argument_name(UDF_INIT *initid, UDF_ARGS *args, char *result, unsigned long *length, char *null_value, char *error); @@ -1011,8 +1010,6 @@ my_bool myfunc_argument_name_init(UDF_INIT *initid, UDF_ARGS *args, return 0; } -void myfunc_argument_name_deinit(UDF_INIT *initid) {} - char *myfunc_argument_name(UDF_INIT *initid, UDF_ARGS *args, char *result, unsigned long *length, char *null_value, char *error) diff --git a/tests/udf_test b/tests/udf_test index 2bdacc34d13..15ad640f984 100644 --- a/tests/udf_test +++ b/tests/udf_test @@ -21,7 +21,7 @@ create temporary table t1 (a int,b double); insert into t1 values (1,5),(1,4),(2,8),(3,9),(4,11); select avgcost(a,b) from t1; select avgcost(a,b) from t1 group by a; -select a, myfunc_argument_name(a) from t1; +select a, myfunc_argument_name(a), myfunc_argument_name(a as b) from t1; drop table t1; DROP FUNCTION metaphon; diff --git a/tests/udf_test.res b/tests/udf_test.res index cd65d3794d8..de9e9969f3a 100644 --- a/tests/udf_test.res +++ b/tests/udf_test.res @@ -116,12 +116,12 @@ avgcost(a,b) select a, myfunc_argument_name(a) from t1; -------------- -a myfunc_argument_name(a) -1 a -1 a -2 a -3 a -4 a +a myfunc_argument_name(a) myfunc_argument_name(a as b) +1 a b +1 a b +2 a b +3 a b +4 a b 5 rows in set -------------- |