database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

after merge fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2016-03-23 22:45:48 +01:00
parent f67a2211ec
commit 21ee0ca457
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/plugins/r/cracklib_password_check.result
View File

@ -11,7 +11,7 @@ PLUGIN_AUTHOR Sergei Golubchik
PLUGIN_DESCRIPTION Password validation via CrackLib PLUGIN_DESCRIPTION Password validation via CrackLib
PLUGIN_LICENSE GPL PLUGIN_LICENSE GPL
LOAD_OPTION ON LOAD_OPTION ON
PLUGIN_MATURITY Alpha PLUGIN_MATURITY Gamma
PLUGIN_AUTH_VERSION 1.0 PLUGIN_AUTH_VERSION 1.0
grant select on *.* to foocar identified by 'foocar'; grant select on *.* to foocar identified by 'foocar';
ERROR HY000: Your password does not satisfy the current policy requirements ERROR HY000: Your password does not satisfy the current policy requirements

1
sql/sp.cc
View File

@ -1071,6 +1071,7 @@ sp_create_routine(THD *thd, stored_procedure_type type, sp_head *sp)
if (!(table= open_proc_table_for_update(thd))) if (!(table= open_proc_table_for_update(thd)))
{ {
my_error(ER_SP_STORE_FAILED, MYF(0), SP_TYPE_STRING(type),sp->m_name.str); my_error(ER_SP_STORE_FAILED, MYF(0), SP_TYPE_STRING(type),sp->m_name.str);
goto done;
} }
else else
{ {