summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorunknown <mats@romeo.(none)>2006-12-21 19:36:28 +0100
committerunknown <mats@romeo.(none)>2006-12-21 19:36:28 +0100
commitc3315ccca9790db558c854239547d324cd97ab66 (patch)
tree9c48d811e5bac1a0fbe447b8ae9e1462dc428d7d /sql/sql_class.h
parent6d310813ba93bcd4d203925f6f5d9ae52cf9ffe3 (diff)
parent3d68c135d0daa8030665a0a3b9b85e18c9cb76d9 (diff)
downloadmariadb-git-c3315ccca9790db558c854239547d324cd97ab66.tar.gz
Merge romeo.(none):/home/bk/b22864-mysql-5.1-new-rpl
into romeo.(none):/home/bk/merge-b22864-myql-5.1-new-rpl sql/log.h: Auto merged sql/log_event.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/log.cc: Merge with mysql-5.1-new-rpl sql/slave.cc: Merge with mysql-5.1-new-rpl sql/sql_insert.cc: Merge with mysql-5.1-new-rpl
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index a5bdeee9d16..6167a86b057 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -946,6 +946,8 @@ public:
Public interface to write RBR events to the binlog
*/
void binlog_start_trans_and_stmt();
+ int binlog_flush_transaction_cache();
+ void binlog_set_stmt_begin();
int binlog_write_table_map(TABLE *table, bool is_transactional);
int binlog_write_row(TABLE* table, bool is_transactional,
MY_BITMAP const* cols, my_size_t colcnt,