diff options
| author | unknown <mats@romeo.(none)> | 2007-04-12 09:10:45 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-04-12 09:10:45 +0200 |
| commit | 955cbc3adeea9116827effd22685df1bad461cf2 (patch) | |
| tree | 245bcdbde273c80269af8d6a95f5cee6696ccd22 /sql/log.cc | |
| parent | 8baded90e4589f097a83b9f62a14165c375803fc (diff) | |
| parent | 6ed9fc6b7a64bafe85186eb37db8593b8ef2acbc (diff) | |
| download | mariadb-git-955cbc3adeea9116827effd22685df1bad461cf2.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b25688-mysql-5.1-rpl
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/rpl_mi.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index 3cfcabd8363..a93ce03d9e9 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -20,6 +20,7 @@ #include "mysql_priv.h" #include "sql_repl.h" #include "rpl_filter.h" +#include "rpl_rli.h" #include <my_dir.h> #include <stdarg.h> |