diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-21 19:47:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-11-21 19:47:46 +0100 |
| commit | 7f1900705b28a432a91595726f7d58e6d968cbd5 (patch) | |
| tree | a24724ebc45941490e2970d87c495bc5f5cbb64b /sql/sql_repl.h | |
| parent | 375caf99c494a4add7d48d5db3a3ec4b409a256e (diff) | |
| parent | b54aeeb080aba2385204cdd09cba3eedbbf1b891 (diff) | |
| download | mariadb-git-7f1900705b28a432a91595726f7d58e6d968cbd5.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_repl.h')
| -rw-r--r-- | sql/sql_repl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index 4105bdddf4e..8d9a127bca7 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -81,7 +81,6 @@ int rpl_append_gtid_state(String *dest, bool use_binlog); int rpl_load_gtid_state(slave_connection_state *state, bool use_binlog); bool rpl_gtid_pos_check(THD *thd, char *str, size_t len); bool rpl_gtid_pos_update(THD *thd, char *str, size_t len); - #else struct LOAD_FILE_IO_CACHE : public IO_CACHE { }; |