diff options
| author | unknown <lars@black.(none)> | 2006-12-08 23:41:29 +0100 |
|---|---|---|
| committer | unknown <lars@black.(none)> | 2006-12-08 23:41:29 +0100 |
| commit | 26b6dc42910fb80ae13e88482ccc022257e65f25 (patch) | |
| tree | a08468cc6f92f0ceab4eed8473537c51b45be1ff /sql/rpl_injector.h | |
| parent | e54bbaa3fb8793905d37af808b9bee6a49df358a (diff) | |
| parent | b8ff601ebf2890bfe6bd2fe127aa33ae2b1bc90c (diff) | |
| download | mariadb-git-26b6dc42910fb80ae13e88482ccc022257e65f25.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
config/ac-macros/ha_ndbcluster.m4:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_timezone.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/handler.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_injector.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
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/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/t/mysqldump.test:
Manual merge
sql/log_event.cc:
manual merge
Diffstat (limited to 'sql/rpl_injector.h')
| -rw-r--r-- | sql/rpl_injector.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h index 17251f54746..a3dce2184d7 100644 --- a/sql/rpl_injector.h +++ b/sql/rpl_injector.h @@ -21,7 +21,6 @@ /* Pull in 'byte', 'my_off_t', and 'uint32' */ #include <my_global.h> -#ifdef HAVE_ROW_BASED_REPLICATION #include <my_bitmap.h> /* Forward declarations */ @@ -331,5 +330,4 @@ private: */ }; -#endif /* HAVE_ROW_BASED_REPLICATION */ #endif /* INJECTOR_H */ |