From 3cc89b3e85605ecb09b4b2222c8b0b8222a29fde Mon Sep 17 00:00:00 2001 From: Kristian Nielsen Date: Fri, 24 Mar 2017 12:06:29 +0100 Subject: 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. --- sql/sys_vars.ic | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/sys_vars.ic') 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(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) -- cgit v1.2.1