diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-12 23:38:59 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-12 23:38:59 +0300 |
| commit | bc2d4e620ac81824b2e30bf8a1c92e164717b2e1 (patch) | |
| tree | 2a2432e481d124691d9fa4b39d8a192264178bd1 /storage/innobase/handler/ha_innodb.h | |
| parent | bd1f8f5bfaf9748ca445401687cca97a89e0dfee (diff) | |
| parent | 69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4 (diff) | |
| download | mariadb-git-bc2d4e620ac81824b2e30bf8a1c92e164717b2e1.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- extra/comp_err.c
- mysql-test/collections/default.experimental
- mysql-test/r/archive.result
- mysql-test/r/select.result
- mysql-test/suite/binlog/r/binlog_unsafe.result
- mysql-test/suite/binlog/t/binlog_unsafe.test
- mysql-test/suite/rpl/t/disabled.def
- mysql-test/t/archive.test
- mysql-test/t/select.test
- sql/item.cc
- sql/item.h
- sql/item_timefunc.cc
- sql/sql_base.cc
- sql/sql_delete.cc
- sql/sql_load.cc
- sql/sql_partition.cc
- sql/sql_table.cc
- storage/innobase/handler/ha_innodb.cc
- vio/vio.c
Diffstat (limited to 'storage/innobase/handler/ha_innodb.h')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 4779651ee27..31e88ed8530 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -258,12 +258,14 @@ int thd_binlog_format(const MYSQL_THD thd); */ void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all); +#if MYSQL_VERSION_ID > 50140 /** Check if binary logging is filtered for thread's current db. @param thd Thread handle @retval 1 the query is not filtered, 0 otherwise. */ bool thd_binlog_filter_ok(const MYSQL_THD thd); +#endif /* MYSQL_VERSION_ID > 50140 */ } typedef struct trx_struct trx_t; |