diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 14:51:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 14:51:22 +0300 |
| commit | e67daa5653490074850bc9f5d2deef58f2a10d8e (patch) | |
| tree | cf631a1ff96be08423d909702ca3558fda6e56c0 /sql/sp.cc | |
| parent | eb2eaba7fdbd13c9814ab4619cc23d9f140e5485 (diff) | |
| parent | ced3ec4c9ce0853c564532fbe90656cf1c3c2bed (diff) | |
| download | mariadb-git-e67daa5653490074850bc9f5d2deef58f2a10d8e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 971aa4a143f..187e4b52394 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1258,20 +1258,20 @@ Sp_handler::sp_create_routine(THD *thd, const sp_head *sp) const switch (type()) { case SP_TYPE_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 SP_TYPE_PACKAGE_BODY: case SP_TYPE_FUNCTION: case SP_TYPE_PROCEDURE: - ret= sp_drop_routine_internal(thd, sp, table); + if (sp_drop_routine_internal(thd, sp, table)) + goto done; break; case SP_TYPE_TRIGGER: case SP_TYPE_EVENT: DBUG_ASSERT(0); ret= SP_OK; } - if (ret != SP_OK) - goto done; } else if (lex->create_info.if_not_exists()) { |