diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-04-29 11:19:09 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-04-29 11:19:09 +0200 |
| commit | 8683052389e8f59caeb4218dc300d98627be1750 (patch) | |
| tree | 15c814427fd8df8e2e8a460ff4ad868b527640b9 | |
| parent | c174718aed075a3e9102e000710f047c6582b3f1 (diff) | |
| download | mariadb-git-8683052389e8f59caeb4218dc300d98627be1750.tar.gz | |
MDEV-12179: Per-engine mysql.gtid_slave_pos table
Intermediate commit.
Fix compilation for embedded server.
| -rw-r--r-- | sql/rpl_gtid.cc | 2 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 925115af88a..a4a774a0200 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -531,7 +531,9 @@ rpl_slave_state::select_gtid_pos_table(THD *thd, LEX_STRING *out_tablename) to create it, and in a short while it should become available for following transactions. */ +#ifdef HAVE_REPLICATION slave_background_gtid_pos_create_request(table_entry); +#endif break; } table_entry= table_entry->next; diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 84b88f84bbf..6aec02a8291 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3521,6 +3521,8 @@ static Sys_var_plugin Sys_enforce_storage_engine( NO_CMD_LINE, MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&enforced_storage_engine), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_has_super)); + +#ifdef HAVE_REPLICATION /* Check 1. Value for gtid_pos_auto_engines is not NULL. @@ -3555,6 +3557,8 @@ static Sys_var_pluginlist Sys_gtid_pos_auto_engines( GLOBAL_VAR(opt_gtid_pos_auto_plugins), NO_CMD_LINE, DEFAULT(>id_pos_auto_engines), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_gtid_pos_auto_engines)); +#endif + #if defined(ENABLED_DEBUG_SYNC) /* |