diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-20 12:01:37 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-20 12:01:37 +0200 |
commit | 692a44b30928e9bfb8f7a1aaf450fc29fa97c4b8 (patch) | |
tree | d9f3cfb47f6984cd5cb169c757500994a8106689 /sql/sql_udf.cc | |
parent | 1066312a12023d2558eecde84739c4bbb60eb509 (diff) | |
download | mariadb-git-692a44b30928e9bfb8f7a1aaf450fc29fa97c4b8.tar.gz |
MDEV-23327: followup
fix an error with locked taböes
Diffstat (limited to 'sql/sql_udf.cc')
-rw-r--r-- | sql/sql_udf.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index b4e863709d5..2af12d94228 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -654,6 +654,12 @@ enum drop_udf_result mysql_drop_function(THD *thd, const LEX_STRING *udf_name) udf_func *udf; DBUG_ENTER("mysql_drop_function"); + if (thd->locked_tables_mode) + { + my_error(ER_LOCK_OR_ACTIVE_TRANSACTION, MYF(0)); + DBUG_RETURN(UDF_DEL_RESULT_ERROR); + } + if (!(table= open_udf_func_table(thd))) DBUG_RETURN(UDF_DEL_RESULT_ERROR); |