diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-18 10:58:31 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-18 10:58:31 +0200 |
| commit | d4c35861e5cef60a1a71386c3ad01b457408ef17 (patch) | |
| tree | 48cae81f64336253108210407b503807b75be803 /sql | |
| parent | 65c51db57f4953773e443013c366f0d7c24c2229 (diff) | |
| parent | abd3c3a9e16622af52dcf0a2dc72cc88f5eea5b9 (diff) | |
| download | mariadb-git-d4c35861e5cef60a1a71386c3ad01b457408ef17.tar.gz | |
merge mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 268dd2e4a29..23992e8db41 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 e67be146206..693beb87b8a 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)); |