diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-07 15:15:43 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-08 09:46:52 +0100 |
| commit | 79d08e682ff70469abe7146f06b3b4103679e072 (patch) | |
| tree | 7de6b4a6a08219e3f2d649495b4c00c023959d92 /sql/sql_udf.cc | |
| parent | 859a7369c1977baf6e204f4ed8f54b774790a179 (diff) | |
| download | mariadb-git-79d08e682ff70469abe7146f06b3b4103679e072.tar.gz | |
small cleanup: udf_init()/udf_free() calls
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index e5fac48a750..626e5569ccc 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -142,7 +142,7 @@ void udf_init() DBUG_ENTER("ufd_init"); char db[]= "mysql"; /* A subject to casednstr, can't be constant */ - if (initialized) + if (initialized || opt_noacl) DBUG_VOID_RETURN; #ifdef HAVE_PSI_INTERFACE @@ -267,6 +267,8 @@ void udf_free() { /* close all shared libraries */ DBUG_ENTER("udf_free"); + if (opt_noacl) + DBUG_VOID_RETURN; for (uint idx=0 ; idx < udf_hash.records ; idx++) { udf_func *udf=(udf_func*) my_hash_element(&udf_hash,idx); |