database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Code Activity

Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW

Browse Source 
(Review on irc by monty)


mysql-test/r/sp-error.result:
  Renamed a procedure and function to avoid confusion
mysql-test/t/sp-error.test:
  Renamed a procedure and function to avoid confusion
sql/item_func.cc:
  Corrected (and better) way to set/reset the client cap. flag in Item_func_sp::execute()
sql/share/errmsg.txt:
  Changed the ER_SP_BADSELECT error; more accurate, and includes the procedure name.
sql/sql_parse.cc:
  Include the procedure name in the new error message.
This commit is contained in:
unknown
2005-04-27 16:35:49 +02:00
parent 52cb1bc4ff
commit 5c44e1acfe
5 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@@ -4052,7 +4052,7 @@ unsent_create_error:
{
if (! (thd->client_capabilities & CLIENT_MULTI_RESULTS))
{
my_message(ER_SP_BADSELECT, ER(ER_SP_BADSELECT), MYF(0));
my_error(ER_SP_BADSELECT, MYF(0), sp->m_qname.str);
#ifndef EMBEDDED_LIBRARY
thd->net.no_send_ok= nsok;
#endif