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 | 4342dfabb4dd2dbc0edd4c634241f85dcca699d6 (patch) | |
| tree | c77bf7e6fffbe90308dfb1d0b58b5d2d64ffba2b /sql/sql_class.h | |
| parent | 18242cfc39681da00b026403229b6972efbea2c0 (diff) | |
| download | mariadb-git-4342dfabb4dd2dbc0edd4c634241f85dcca699d6.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/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index dd4b8310e51..9f263dbebf3 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1433,10 +1433,10 @@ public: }; #define tmp_disable_binlog(A) \ - ulong save_options= (A)->options; \ - (A)->options&= ~OPTION_BIN_LOG; + {ulong tmp_disable_binlog__save_options= (A)->options; \ + (A)->options&= ~OPTION_BIN_LOG -#define reenable_binlog(A) (A)->options= save_options; +#define reenable_binlog(A) (A)->options= tmp_disable_binlog__save_options;} /* Flags for the THD::system_thread (bitmap) variable */ #define SYSTEM_THREAD_DELAYED_INSERT 1 |