diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-03-24 12:06:29 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-04-21 10:30:16 +0200 |
| commit | 3cc89b3e85605ecb09b4b2222c8b0b8222a29fde (patch) | |
| tree | 8f47b17503e935e0c38be9cd95c48976a6ffd37d /sql/sys_vars.ic | |
| parent | 4eebf431b07b93cc05e1b15f1e77b6cfcdcf737f (diff) | |
| download | mariadb-git-3cc89b3e85605ecb09b4b2222c8b0b8222a29fde.tar.gz | |
MDEV-12179: Per-engine mysql.gtid_slave_pos table
Intermediate commit.
Ignore unknown engines in --gtid-pos-auto-engines command-line options (but
not SET GLOBAL). This seems useful, to allow a default that auto-creates the
gtid pos table for engines like TokuDB and MyRocks (which greatly benefit
from such), but does not prevent server startup when those engines are not
available.
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index e76f60b56b0..c5fe8c0af2c 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -1575,9 +1575,9 @@ public: plugin_ref *plugins; if (!(res=var->value->val_str(&str))) - plugins= resolve_engine_list("", 0); + plugins= resolve_engine_list("", 0, true); else - plugins= resolve_engine_list(res->ptr(), res->length()); + plugins= resolve_engine_list(res->ptr(), res->length(), true); if (!plugins) return true; var->save_result.plugins= plugins; @@ -1611,7 +1611,7 @@ public: char *default_value= *reinterpret_cast<char**>(option.def_value); if (!default_value) return 0; - return resolve_engine_list(default_value, strlen(default_value)); + return resolve_engine_list(default_value, strlen(default_value), false); } void global_save_default(THD *thd, set_var *var) |