diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-06-27 17:51:35 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-06-27 17:51:35 +0300 |
| commit | cfdd73369c0c2d57908af8dc727de33567fe9e0b (patch) | |
| tree | 12bdcd18fb3072cb578c358e9acd8f5a8df3f19e /sql/slave.cc | |
| parent | a0fa27cf359397d721272635482a7d03687ad241 (diff) | |
| parent | 5444b55cbbab69a508e6c477a1b9580eff969da1 (diff) | |
| download | mariadb-git-cfdd73369c0c2d57908af8dc727de33567fe9e0b.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into hynda.mysql.fi:/home/my/mysql-maria
configure.in:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 6c7968c2b3f..512c4bc8d12 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -28,6 +28,8 @@ #include <sql_common.h> #include <errmsg.h> +static Log_event* next_event(RELAY_LOG_INFO* rli); + #ifdef HAVE_REPLICATION #include "rpl_tblmap.h" |