diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-23 19:03:42 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-23 19:03:42 +0200 |
| commit | 9c232a2c821f0567f56991a63a6eaf720c504695 (patch) | |
| tree | ff699bb747b986281d05d3640c47cd8a416a7006 /sql/sys_vars.cc | |
| parent | f49019547b56ae67dfa09a91e66dd863cced97b5 (diff) | |
| download | mariadb-git-9c232a2c821f0567f56991a63a6eaf720c504695.tar.gz | |
Bug #11766306: 59393: have_innodb=yes when mysqld started with --skip-innodb
Initialized correctly the have_innodb variable so that when the plugin is not initialized it
stays "disabled" instead of "yes".
Test suite added.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 8f9b91f0f92..1a7097e4bdf 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2766,7 +2766,7 @@ static Sys_var_charptr Sys_slow_log_path( ON_CHECK(check_log_path), ON_UPDATE(fix_slow_log_file)); /// @todo deprecate these four legacy have_PLUGIN variables and use I_S instead -export SHOW_COMP_OPTION have_csv, have_innodb; +export SHOW_COMP_OPTION have_csv, have_innodb= SHOW_OPTION_DISABLED; export SHOW_COMP_OPTION have_ndbcluster, have_partitioning; static Sys_var_have Sys_have_csv( "have_csv", "have_csv", |