diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 10:17:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 10:17:15 +0300 |
| commit | 9936cfd531a49b0ba124c4eb38a6099ec420c7fd (patch) | |
| tree | 52e3c6dd19846b7ff0d895c31e78bc1e781ca780 /sql/sp.cc | |
| parent | a7634281aa64a549d19cd20ead7e80d0267271ee (diff) | |
| parent | 8a0944080c950349aaf7c81bc8f8c63b262f98eb (diff) | |
| download | mariadb-git-9936cfd531a49b0ba124c4eb38a6099ec420c7fd.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index e8611159df0..081edcd725e 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2002, 2018, Oracle and/or its affiliates. - Copyright (c) 2009, 2018, MariaDB + Copyright (c) 2009, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1234,20 +1234,20 @@ Sp_handler::sp_create_routine(THD *thd, const sp_head *sp) const switch (type()) { case TYPE_ENUM_PACKAGE: // Drop together with its PACKAGE BODY mysql.proc record - ret= sp_handler_package_spec.sp_find_and_drop_routine(thd, table, sp); + if (sp_handler_package_spec.sp_find_and_drop_routine(thd, table, sp)) + goto done; break; case TYPE_ENUM_PACKAGE_BODY: case TYPE_ENUM_FUNCTION: case TYPE_ENUM_PROCEDURE: - ret= sp_drop_routine_internal(thd, sp, table); + if (sp_drop_routine_internal(thd, sp, table)) + goto done; break; case TYPE_ENUM_TRIGGER: case TYPE_ENUM_PROXY: DBUG_ASSERT(0); ret= SP_OK; } - if (ret != SP_OK) - goto done; } else if (lex->create_info.if_not_exists()) { |