diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-15 12:29:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:22 +0100 |
| commit | dfe6e914e58472159f34a8a4c9288ff61eac479f (patch) | |
| tree | c838143436debf2e19d5b702efdb3d20c08c168c /sql | |
| parent | f3f31eaa8e8a07adc0d6769f77f1ccfb129529de (diff) | |
| download | mariadb-git-dfe6e914e58472159f34a8a4c9288ff61eac479f.tar.gz | |
cleanup: remove TYPE_ENUM_PROXY from enum stored_procedure_type
because it is not
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sp.cc | 1 | ||||
| -rw-r--r-- | sql/sp.h | 5 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index ae413fcf615..15a5f9b287d 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1241,7 +1241,6 @@ Sp_handler::sp_create_routine(THD *thd, const sp_head *sp) const ret= sp_drop_routine_internal(thd, sp, table); break; case TYPE_ENUM_TRIGGER: - case TYPE_ENUM_PROXY: DBUG_ASSERT(0); ret= SP_OK; } @@ -54,8 +54,7 @@ enum stored_procedure_type TYPE_ENUM_PROCEDURE=2, TYPE_ENUM_PACKAGE=3, TYPE_ENUM_PACKAGE_BODY=4, - TYPE_ENUM_TRIGGER=5, - TYPE_ENUM_PROXY=6 + TYPE_ENUM_TRIGGER=5 }; @@ -506,8 +505,6 @@ inline const Sp_handler *Sp_handler::handler(stored_procedure_type type) return &sp_handler_package_body; case TYPE_ENUM_TRIGGER: return &sp_handler_trigger; - case TYPE_ENUM_PROXY: - break; } return NULL; } diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 0a6e3cfb0d8..aeb05f27b30 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -5883,7 +5883,6 @@ static enum PRIVS_TO_MERGE::what sp_privs_to_merge(stored_procedure_type type) case TYPE_ENUM_PACKAGE_BODY: return PRIVS_TO_MERGE::PACKAGE_BODY; case TYPE_ENUM_TRIGGER: - case TYPE_ENUM_PROXY: break; } DBUG_ASSERT(0); |