From e0e281ecb8710ee7325610bb00bc24c055137e14 Mon Sep 17 00:00:00 2001
From: "pem@mysql.comhem.se" <>
Date: Tue, 12 Apr 2005 14:52:54 +0200
Subject: [PATCH] Fixed BUG#6663: Stored Procedures code report non-selected DB
                 when CREATE but not when ALTER

---
 sql/sql_parse.cc | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index ac1b1148cf8..ee385f9792e 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -4128,7 +4128,15 @@ unsent_create_error:
 	sp= sp_find_function(thd, lex->spname);
       mysql_reset_errors(thd, 0);
       if (! sp)
-	result= SP_KEY_NOT_FOUND;
+      {
+	if (lex->spname->m_db.str)
+	  result= SP_KEY_NOT_FOUND;
+	else
+	{
+	  my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
+	  goto error;
+	}
+      }
       else
       {
         if (check_procedure_access(thd, ALTER_PROC_ACL, sp->m_db.str, 
@@ -4207,7 +4215,13 @@ unsent_create_error:
 	  }
 	}
 #endif
-	result= SP_KEY_NOT_FOUND;
+	if (lex->spname->m_db.str)
+	  result= SP_KEY_NOT_FOUND;
+	else
+	{
+	  my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
+	  goto error;
+	}
       }
       res= result;
       switch (result)