diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-06-23 18:29:10 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-06-23 18:29:10 +0300 |
| commit | a5e742fedd4324d29867a15a6cabb54959108fbb (patch) | |
| tree | c77bf7e6fffbe90308dfb1d0b58b5d2d64ffba2b /sql/protocol.cc | |
| parent | 6487eb814ff3d162a70ff6d4d90c442256a931dd (diff) | |
| download | mariadb-git-a5e742fedd4324d29867a15a6cabb54959108fbb.tar.gz | |
fixed environment restoring in case of error during SP function execution (BUG#9503)
#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
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 57922cdc677..1c399a89a99 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -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); |