MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Magne Mahre Date:August 11 2010 9:16pm
Subject:bzr commit into mysql-5.5-bugfixing branch (magne.mahre:3101) Bug#55547
View as plain text  
#At file:///data/x/mysql-5.5-runtime-55547/ based on revid:kostja@stripped

 3101 Magne Mahre	2010-08-11
      Bug #55547 InnoDB is not included when configuring by default
      
      When using autotools to build MySQL, InnoDB is not included
      by default, which causes all tests to fail.
      
      Since autotools is being phased out, and the auto-inclusion
      of InnoDB requires quite a lot of m4 hacking, this fix will
      instead set the default storage engine to MyISAM in the case 
      InnoDB hasn't been built.  This allows the tests to pass, with
      some minor modifications.
     @ mysql-test/t/bootstrap-master.opt
        If InnoDB hasn't been built, the option --skip-innodb
        isn't available.  We prefix with 'loose' to allow the
        option to be used at all times.
     @ sql/mysqld.cc
        If this is the embedded version, MyISAM will be default.
        If InnoDB has not been built, MyISAM will be default.
        Otherwise, InnoDB will be default.

    modified:
      config.h.cmake
      mysql-test/suite/perfschema/t/no_threads-master.opt
      mysql-test/suite/rpl/t/rpl_typeconv.test
      mysql-test/t/bootstrap-master.opt
      mysql-test/t/bootstrap.test
      mysql-test/t/loaddata.test
      mysql-test/t/lock.test
      mysql-test/t/range.test
      mysql-test/t/variables.test
      sql/mysqld.cc
=== modified file 'config.h.cmake'
--- a/config.h.cmake	2010-07-29 09:42:55 +0000
+++ b/config.h.cmake	2010-08-11 21:16:50 +0000
@@ -590,6 +590,7 @@
 #cmakedefine WITH_CSV_STORAGE_ENGINE 1
 #cmakedefine WITH_PARTITION_STORAGE_ENGINE 1
 #cmakedefine WITH_PERFSCHEMA_STORAGE_ENGINE 1
+#cmakedefine WITH_INNOBASE_STORAGE_ENGINE 1
 #cmakedefine WITH_NDBCLUSTER_STORAGE_ENGINE 1
 #if (WITH_NDBCLUSTER_STORAGE_ENGINE) && !defined(EMBEDDED_LIBRARY)
 # define HAVE_NDB_BINLOG 1

=== modified file 'mysql-test/suite/perfschema/t/no_threads-master.opt'
--- a/mysql-test/suite/perfschema/t/no_threads-master.opt	2010-06-22 10:13:47 +0000
+++ b/mysql-test/suite/perfschema/t/no_threads-master.opt	2010-08-11 21:16:50 +0000
@@ -1 +1 @@
---one-thread --thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --skip-innodb
+--one-thread --thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --loose-skip-innodb

=== modified file 'mysql-test/suite/rpl/t/rpl_typeconv.test'
--- a/mysql-test/suite/rpl/t/rpl_typeconv.test	2009-12-14 11:04:55 +0000
+++ b/mysql-test/suite/rpl/t/rpl_typeconv.test	2010-08-11 21:16:50 +0000
@@ -1,5 +1,6 @@
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
+--source include/have_innodb.inc
 
 connection slave;
 set @saved_slave_type_conversions = @@global.slave_type_conversions;

=== modified file 'mysql-test/t/bootstrap-master.opt'
--- a/mysql-test/t/bootstrap-master.opt	2010-06-17 20:51:35 +0000
+++ b/mysql-test/t/bootstrap-master.opt	2010-08-11 21:16:50 +0000
@@ -1 +1 @@
---default-storage-engine=MyISAM --skip-innodb
+--default-storage-engine=MyISAM --loose-skip-innodb

=== 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	2010-08-11 21:16:50 +0000
@@ -8,7 +8,7 @@ drop table if exists t1;
 
 # Add the datadir to the bootstrap command
 let $MYSQLD_DATADIR= `select @@datadir`;
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --default-storage-engine=MyISAM --skip-innodb;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --default-storage-engine=MyISAM --loose-skip-innodb;
 #
 # Check that --bootstrap reads from stdin
 #

=== modified file 'mysql-test/t/loaddata.test'
--- a/mysql-test/t/loaddata.test	2010-07-14 12:05:20 +0000
+++ b/mysql-test/t/loaddata.test	2010-08-11 21:16:50 +0000
@@ -1,6 +1,7 @@
 #
 # Some simple test of load data
 #
+--source include/have_ucs2.inc
 
 --disable_warnings
 drop table if exists t1, t2;

=== modified file 'mysql-test/t/lock.test'
--- a/mysql-test/t/lock.test	2010-02-01 11:43:06 +0000
+++ b/mysql-test/t/lock.test	2010-08-11 21:16:50 +0000
@@ -1,7 +1,7 @@
 #
 # Testing of table locking
 #
-
+--source include/have_partition.inc
 # Save the initial number of concurrent sessions.
 --source include/count_sessions.inc
 

=== modified file 'mysql-test/t/range.test'
--- a/mysql-test/t/range.test	2010-05-10 07:23:23 +0000
+++ b/mysql-test/t/range.test	2010-08-11 21:16:50 +0000
@@ -1,3 +1,4 @@
+--source include/have_partition.inc
 #
 # Problem with range optimizer
 #

=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test	2010-07-27 10:25:53 +0000
+++ b/mysql-test/t/variables.test	2010-08-11 21:16:50 +0000
@@ -1,6 +1,7 @@
 #
 # test variables
 #
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-07-29 12:32:11 +0000
+++ b/sql/mysqld.cc	2010-08-11 21:16:50 +0000
@@ -3154,11 +3154,17 @@ static int init_common_variables()
     From MySQL 5.5 onwards, the default storage engine is InnoDB
     (except in the embedded server, where the default continues to
     be MyISAM)
+
+    Since MyISAM is still a mandatory component, we revert to it
+    in case InnoDB is not available.
   */
-#ifdef EMBEDDED_LIBRARY
+#if defined(EMBEDDED_LIBRARY)
   default_storage_engine= const_cast<char *>("MyISAM");
-#else
+#elif defined(WITH_INNOBASE_STORAGE_ENGINE)
   default_storage_engine= const_cast<char *>("InnoDB");
+#else
+  /* if InnoDB is not built, we revert back to MyISAM */
+  default_storage_engine= const_cast<char *>("MyISAM");
 #endif
 
   /*


Attachment: [text/bzr-bundle] bzr/magne.mahre@sun.com-20100811211650-5qjch597dzptua4o.bundle
Thread
bzr commit into mysql-5.5-bugfixing branch (magne.mahre:3101) Bug#55547Magne Mahre11 Aug