diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-23 13:47:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-23 13:47:15 +0300 |
| commit | 13eae1885e739a234cebd592f891e87f387784c6 (patch) | |
| tree | 0bd1d9dacec4bd9442bb1667648ef416fcc5fb9e /sql | |
| parent | a69cf6f07ee7286d4813ef5c602d5b79b39d3028 (diff) | |
| parent | ce23802c0e4c85018f2141d2ebb0602dc0d3d6d8 (diff) | |
| download | mariadb-git-13eae1885e739a234cebd592f891e87f387784c6.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_udf.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 400a8ae8c30..294d35f24da 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -609,7 +609,7 @@ int mysql_create_function(THD *thd,udf_func *udf) /* Allow creation of functions even if we can't open func table */ if (unlikely(!table)) - goto err; + goto err_open_func_table; table->use_all_columns(); restore_record(table, s->default_values); // Default values for fields table->field[0]->store(u_d->name.str, u_d->name.length, system_charset_info); @@ -623,7 +623,7 @@ int mysql_create_function(THD *thd,udf_func *udf) { my_error(ER_ERROR_ON_WRITE, MYF(0), "mysql.func", error); del_udf(u_d); - goto err; + goto err_open_func_table; } done: @@ -638,6 +638,7 @@ done: err: if (new_dl) dlclose(dl); +err_open_func_table: mysql_rwlock_unlock(&THR_LOCK_udf); DBUG_RETURN(1); } |