diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 15:10:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 15:10:59 +0300 |
| commit | 646a6005e7882f9d4baf516c7936e5ef88ea89a6 (patch) | |
| tree | d5b348bec9d756be164dd83fa052b80512f77e2f /sql/sp.cc | |
| parent | 6b6c012f330cbbdcdee32333f16813764e5ed466 (diff) | |
| parent | 67a03b7c947f5a0cfddbe1acc5e560fc737b0848 (diff) | |
| download | mariadb-git-646a6005e7882f9d4baf516c7936e5ef88ea89a6.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 29154b85fd4..b9757887e7a 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1081,7 +1081,7 @@ sp_create_routine(THD *thd, stored_procedure_type type, sp_head *sp) { if (lex->create_info.or_replace()) { - if ((ret= sp_drop_routine_internal(thd, type, lex->spname, table))) + if (sp_drop_routine_internal(thd, type, lex->spname, table)) goto done; } else if (lex->create_info.if_not_exists()) |