diff options
| author | unknown <lars@mysql.com> | 2006-05-17 15:14:07 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-05-17 15:14:07 +0200 |
| commit | 883b2229a52ab3321322f517fb27c371c5f72f3b (patch) | |
| tree | ebfe2d523ca4483b5f0bc6a4b0d768b11eb4ea39 /sql/sql_class.h | |
| parent | c4e26cb03dc35bb980e493e37a91b725e0d21b3b (diff) | |
| parent | 36815fa1ad44d678c7ba01312562d08a550cb0ca (diff) | |
| download | mariadb-git-883b2229a52ab3321322f517fb27c371c5f72f3b.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/t/innodb_mysql.test:
Manual merge
sql/log.cc:
Manual merge
sql/set_var.cc:
Manual merge
sql/sql_base.cc:
Manual merge
sql/sql_class.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 04095ff9acd..d9118cc7607 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -890,8 +890,10 @@ public: /* container for handler's private per-connection data */ void *ha_data[MAX_HA]; -#ifdef HAVE_ROW_BASED_REPLICATION #ifndef MYSQL_CLIENT + int binlog_setup_trx_data(); + +#ifdef HAVE_ROW_BASED_REPLICATION /* Public interface to write RBR events to the binlog @@ -921,7 +923,6 @@ public: RowsEventT* hint); Rows_log_event* binlog_get_pending_rows_event() const; void binlog_set_pending_rows_event(Rows_log_event* ev); - int binlog_setup_trx_data(); my_size_t max_row_length_blob(TABLE* table, const byte *data) const; my_size_t max_row_length(TABLE* table, const byte *data) const @@ -945,8 +946,9 @@ private: public: -#endif #endif /* HAVE_ROW_BASED_REPLICATION */ +#endif /* MYSQL_CLIENT */ + #ifndef MYSQL_CLIENT enum enum_binlog_query_type { /* @@ -1384,15 +1386,21 @@ public: inline void set_current_stmt_binlog_row_based_if_mixed() { if (variables.binlog_format == BINLOG_FORMAT_MIXED) - current_stmt_binlog_row_based= 1; + current_stmt_binlog_row_based= TRUE; } inline void set_current_stmt_binlog_row_based() { - current_stmt_binlog_row_based= 1; + current_stmt_binlog_row_based= TRUE; } +#endif inline void reset_current_stmt_binlog_row_based() { - current_stmt_binlog_row_based= test(variables.binlog_format == BINLOG_FORMAT_ROW); +#ifdef HAVE_ROW_BASED_REPLICATION + current_stmt_binlog_row_based= + test(variables.binlog_format == BINLOG_FORMAT_ROW); +#else + current_stmt_binlog_row_based= FALSE; +#endif } #endif /*HAVE_ROW_BASED_REPLICATION*/ }; @@ -1586,7 +1594,9 @@ public: {} int prepare(List<Item> &list, SELECT_LEX_UNIT *u); +#ifdef HAVE_ROW_BASED_REPLICATION void binlog_show_create_table(TABLE **tables, uint count); +#endif void store_values(List<Item> &values); void send_error(uint errcode,const char *err); bool send_eof(); |