after merge fixes

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

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
   {