From 9f5b285662ed8c13d6e87d8baf2f0ad4484d4a85 Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Thu, 24 Mar 2016 09:45:28 +0100
Subject: [PATCH] Followup for 2783fc7: return an error to the caller if
 mysql.proc cannot be opened

---
 mysql-test/suite/plugins/r/cracklib_password_check.result | 2 +-
 sql/sp.cc                                                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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
   {