diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-03-23 22:45:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-23 22:45:48 +0100 |
| commit | 21ee0ca4573965c85c23d1df1737629eb85f70d8 (patch) | |
| tree | 1a852ee438f830f4bb55886cb3d781b8e0145ea1 | |
| parent | f67a2211ec48b1b1502a7095c50cd9195d8235f8 (diff) | |
| download | mariadb-git-21ee0ca4573965c85c23d1df1737629eb85f70d8.tar.gz | |
after merge fixes
| -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 { |