diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-03-24 09:45:28 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-03-24 09:45:28 +0100 |
| commit | 9f5b285662ed8c13d6e87d8baf2f0ad4484d4a85 (patch) | |
| tree | 88ffb36cfa02e5a091cf63a2a921f7c3d1fd1d4d | |
| parent | 2cb72dcccb640e546cf202481fa545c9cf5ded3a (diff) | |
| download | mariadb-git-9f5b285662ed8c13d6e87d8baf2f0ad4484d4a85.tar.gz | |
Followup for 2783fc7: return an error to the caller if mysql.proc cannot be openedmariadb-10.1.13
| -rw-r--r-- | mysql-test/suite/plugins/r/cracklib_password_check.result | 2 | ||||
| -rw-r--r-- | sql/sp.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/plugins/r/cracklib_password_check.result b/mysql-test/suite/plugins/r/cracklib_password_check.result index 9a58c169177..638f138b986 100644 --- a/mysql-test/suite/plugins/r/cracklib_password_check.result +++ b/mysql-test/suite/plugins/r/cracklib_password_check.result @@ -11,7 +11,7 @@ PLUGIN_AUTHOR Sergei Golubchik PLUGIN_DESCRIPTION Password validation via CrackLib PLUGIN_LICENSE GPL LOAD_OPTION ON -PLUGIN_MATURITY Alpha +PLUGIN_MATURITY Gamma PLUGIN_AUTH_VERSION 1.0 grant select on *.* to foocar identified by 'foocar'; ERROR HY000: Your password does not satisfy the current policy requirements diff --git a/sql/sp.cc b/sql/sp.cc index 3cc24089c40..a518b520786 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1071,6 +1071,7 @@ sp_create_routine(THD *thd, stored_procedure_type type, sp_head *sp) if (!(table= open_proc_table_for_update(thd))) { my_error(ER_SP_STORE_FAILED, MYF(0), SP_TYPE_STRING(type),sp->m_name.str); + goto done; } else { |