bzr commit into mysql-5.5 branch (Georgi.Kodinov:3396) Bug#11766306

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B11766306-5.5/ based on revid:bjorn.munch@stripped

 3396 Georgi Kodinov	2011-03-23
      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.

    modified:
      mysql-test/r/bootstrap.result
      mysql-test/t/bootstrap.test
      sql/sys_vars.cc
=== modified file 'mysql-test/r/bootstrap.result'
--- a/mysql-test/r/bootstrap.result	2007-02-20 11:48:15 +0000
+++ b/mysql-test/r/bootstrap.result	2011-03-23 17:03:42 +0000
@@ -6,3 +6,15 @@ set @my_max_allowed_packet= @@max_allowe
 set global max_allowed_packet=100*@@max_allowed_packet;
 set global max_allowed_packet=@my_max_allowed_packet;
 drop table t1;
+End of 5.1 tests
+#
+# Bug #11766306: 59393: HAVE_INNODB=YES WHEN MYSQLD 
+#  STARTED WITH --SKIP-INNODB
+#
+SHOW VARIABLES LIKE 'have_innodb';
+Variable_name	Value
+have_innodb	DISABLED
+SELECT SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb';
+SUPPORT
+NO
+End of 5.5 tests

=== modified file 'mysql-test/t/bootstrap.test'
--- a/mysql-test/t/bootstrap.test	2010-06-17 20:51:35 +0000
+++ b/mysql-test/t/bootstrap.test	2011-03-23 17:03:42 +0000
@@ -49,3 +49,15 @@ remove_file $MYSQLTEST_VARDIR/tmp/long_q
 set global max_allowed_packet=@my_max_allowed_packet;
 drop table t1;
 
+--echo End of 5.1 tests
+
+--echo #
+--echo # Bug #11766306: 59393: HAVE_INNODB=YES WHEN MYSQLD 
+--echo #  STARTED WITH --SKIP-INNODB
+--echo #
+
+# need the --skip-innodb option present for the test to succeed
+SHOW VARIABLES LIKE 'have_innodb';
+SELECT SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb';
+
+--echo End of 5.5 tests

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2011-03-15 12:57:36 +0000
+++ b/sql/sys_vars.cc	2011-03-23 17:03:42 +0000
@@ -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",


Attachment: [text/bzr-bundle] bzr/[e-mail]