diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-27 18:13:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-27 18:13:17 +0200 |
| commit | 9a64d0794c3dce1652839820350a8c4b9b510e99 (patch) | |
| tree | 33ebd07354a15944288a071bd9319dfa34f226ef /sql/rpl_utility.cc | |
| parent | ced3907c02dfa3b237e14d79aa800b3a0769e94a (diff) | |
| parent | e988c4dde6c1b88523b1d4e748cbd4f5025b128d (diff) | |
| download | mariadb-git-9a64d0794c3dce1652839820350a8c4b9b510e99.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/rpl_utility.cc')
| -rw-r--r-- | sql/rpl_utility.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index 388a6c9f9bb..069fac1c3ec 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -15,11 +15,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "rpl_utility.h" +#include "log_event.h" -#ifndef MYSQL_CLIENT -#include "unireg.h" // REQUIRED by later includes +#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #include "rpl_rli.h" -#include "log_event.h" #include "sql_select.h" /** @@ -954,7 +953,6 @@ TABLE *table_def::create_conversion_table(THD *thd, Relay_log_info *rli, TABLE * target_table->s->table_name.str); DBUG_RETURN(conv_table); } - #endif /* MYSQL_CLIENT */ table_def::table_def(unsigned char *types, ulong size, @@ -1115,7 +1113,6 @@ bool event_checksum_test(uchar *event_buf, ulong event_len, uint8 alg) return DBUG_EVALUATE_IF("simulate_checksum_test_failure", TRUE, res); } - #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) Deferred_log_events::Deferred_log_events(Relay_log_info *rli) : last_added(NULL) |