diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-05-31 20:17:31 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-05-31 20:17:31 +0200 |
| commit | db0ce6ff6eb7c7dd16538fc8ce63e9ce8660000d (patch) | |
| tree | bbfe50d2fc0a5dc85adedfa669b350604759b382 /sql/sql_class.h | |
| parent | 80af30efe10621b7c2b64f98cf957e0c1b5b5f8d (diff) | |
| parent | e9adcac2e8f663dbfda38ea917e00ca8af18440c (diff) | |
| download | mariadb-git-db0ce6ff6eb7c7dd16538fc8ce63e9ce8660000d.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b28618-mysql-5.1-rpl
sql/item_create.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_lex.h:
Manual merge.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index a0b1402d060..fb713d8a80b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1110,6 +1110,17 @@ public: private: uint binlog_table_maps; // Number of table maps currently in the binlog + + enum enum_binlog_flag { + BINLOG_FLAG_UNSAFE_STMT_PRINTED, + BINLOG_FLAG_COUNT + }; + + /** + Flags with per-thread information regarding the status of the + binary log. + */ + uint32 binlog_flags; public: uint get_binlog_table_maps() const { return binlog_table_maps; @@ -1680,6 +1691,7 @@ public: void restore_sub_statement_state(Sub_statement_state *backup); void set_n_backup_active_arena(Query_arena *set, Query_arena *backup); void restore_active_arena(Query_arena *set, Query_arena *backup); + inline void set_current_stmt_binlog_row_based_if_mixed() { /* |