diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 268dd2e4a29d004e008d97807a53918e23367bb7..23992e8db41808737a23dd3f7646cfb514f05b54 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3804,6 +3804,10 @@ a file name for --log-bin-index option", opt_binlog_index_name); if (ha_init_errors()) DBUG_RETURN(1); + if (opt_ignore_builtin_innodb) + sql_print_warning("ignore-builtin-innodb is deprecated " + "and will be removed in future releases."); + if (plugin_init(&remaining_argc, remaining_argv, (opt_noacl ? PLUGIN_INIT_SKIP_PLUGIN_TABLE : 0) | (opt_help ? PLUGIN_INIT_SKIP_INITIALIZATION : 0))) diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index e67be146206b60181ea1802a0ad0c54f488a54d6..693beb87b8a32c5f83a2625d11ec628de9de2a5e 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -854,6 +854,7 @@ static Sys_var_charptr Sys_ft_stopword_file( static Sys_var_mybool Sys_ignore_builtin_innodb( "ignore_builtin_innodb", + "DEPRECATED. This option will be removed in future releases. " "Disable initialization of builtin InnoDB plugin", READ_ONLY GLOBAL_VAR(opt_ignore_builtin_innodb), CMD_LINE(OPT_ARG), DEFAULT(FALSE));