database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

fixed environment restoring in case of error during SP function execution (BUG#9503)

Browse Source 
#define macro improvement


mysql-test/r/sp-security.result:
  BUG#9503: reseting correct parameters of thread after error in SP function
mysql-test/t/sp-security.test:
  BUG#9503: reseting correct parameters of thread after error in SP function
sql/item_func.cc:
  fixed environment restoring in case of error during SP function execution
sql/protocol.cc:
  added debug print
sql/sql_class.h:
  fixed #defines to force them to be alvaise in piar, and variable name made more complex for accident repeating in other code
This commit is contained in:
unknown
2005-06-23 18:29:10 +03:00
parent 6487eb814f
commit a5e742fedd
5 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/protocol.cc
View File

@@ -294,7 +294,12 @@ send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message)
DBUG_ENTER("send_ok");
if (net->no_send_ok || !net->vio) // hack for re-parsing queries
{
DBUG_PRINT("info", ("no send ok: %s, vio present: %s",
(net->no_send_ok ? "YES" : "NO"),
(net->vio ? "YES" : "NO")));
DBUG_VOID_RETURN;
}
buff[0]=0; // No fields
pos=net_store_length(buff+1,(ulonglong) affected_rows);