database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

Browse Source 
into  kindahl-laptop.dnsalias.net:/home/bk/b28618-mysql-5.1-rpl
This commit is contained in:
mats@kindahl-laptop.dnsalias.net
2007-05-31 20:17:31 +02:00
parent 685293b985 b1bd9a6c4f
commit 5c662d6d7c
15 changed files with 137 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_class.h
View File

@@ -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()
{
/*