diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-31 15:23:25 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-31 15:23:25 +0300 |
| commit | 125bc936ac66ce20898311a20343292b8107e3eb (patch) | |
| tree | a32fe617148b1f7930fc656c7fb3aad75bfeb99d /sql/sql_class.h | |
| parent | 6c589f90846cbaaeea9f0ff86f4b6011aa8622a9 (diff) | |
| parent | 21d639e573d483a354c8ddbf17471ee468cce926 (diff) | |
| download | mariadb-git-125bc936ac66ce20898311a20343292b8107e3eb.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B27417-5.0-opt
sql/handler.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index ef719cdded7..1488c0c59c4 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1486,10 +1486,6 @@ public: bool charset_is_system_charset, charset_is_collation_connection; bool charset_is_character_set_filesystem; bool enable_slow_log; /* enable slow log for current statement */ - struct { - bool all:1; - bool stmt:1; - } no_trans_update; bool abort_on_warning; bool got_warning; /* Set on call to push_warning() */ bool no_warnings_for_error; /* no warnings on call to my_error() */ @@ -1740,7 +1736,7 @@ public: inline bool really_abort_on_warning() { return (abort_on_warning && - (!no_trans_update.stmt || + (!transaction.stmt.modified_non_trans_table || (variables.sql_mode & MODE_STRICT_ALL_TABLES))); } void set_status_var_init(); |