diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-06-11 14:53:26 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-06-11 14:53:26 +0200 |
| commit | 93bcda598bd6c58a7f5ad3d2e860b194325eed9f (patch) | |
| tree | 014bccd2ba79d230f4f3cb4ff03f89640b99e1e4 /sql/rpl_rli.cc | |
| parent | d2d7b5bbb6796ee171ef605f5ea61cb782918b72 (diff) | |
| parent | 121461f6f3987c4b058d64775f1380016b68896c (diff) | |
| download | mariadb-git-93bcda598bd6c58a7f5ad3d2e860b194325eed9f.tar.gz | |
Merge latest XtraDB from lp:percona-xtradb into MariaDB.
include/my_sys.h:
Move generic file parsing functions out to shared code, as they are used in several places.
mysys/mf_iocache2.c:
Move generic file parsing functions out to shared code, as they are used in several places.
sql/log_event.cc:
Fix XtraDB build with embedded server.
XtraDB needs access to replication stuff, which is missing in embedded server.
Solved by defining wrapper function for this which is compiled differently for normal and
embedded case.
sql/log_event.h:
Fix XtraDB build with embedded server.
XtraDB needs access to replication stuff, which is missing in embedded server.
Solved by defining wrapper function for this which is compiled differently for normal and
embedded case.
sql/slave.cc:
Move generic file parsing functions out to shared code, as they are used in several places.
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index aa11f3bfbfc..dbedd808cd5 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -23,11 +23,6 @@ static int count_relay_log_space(Relay_log_info* rli); -// Defined in slave.cc -int init_intvar_from_file(int* var, IO_CACHE* f, int default_val); -int init_strvar_from_file(char *var, int max_size, IO_CACHE *f, - const char *default_val); - Relay_log_info::Relay_log_info() :Slave_reporting_capability("SQL"), |