bk commit into 4.1 tree (acurtis:1.2162)

[antony]

Below is the list of changes that have just been committed into a local
4.1 repository of acurtis. When acurtis does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2162 05/04/25 22:36:51 acurtis@stripped +7 -0
  Bug#7454
    Fix for crash when using disabled innodb as default storage engine
    Tests included.

  BitKeeper/etc/logging_ok
    1.365 05/04/25 22:36:48 acurtis@stripped +1 -0
    Logging to logging@stripped accepted

  mysql-test/t/innodb_skip.test
    1.1 05/04/25 22:36:23 acurtis@stripped +7 -0

  mysql-test/t/innodb_skip-master.opt
    1.1 05/04/25 22:36:23 acurtis@stripped +1 -0

  mysql-test/t/innodb_skip.test
    1.0 05/04/25 22:36:23 acurtis@stripped +0 -0
    BitKeeper file
/.amd_mnt/bk.anubis/host/work-acurtis/bug7454/mysql-test/t/innodb_skip.test

  mysql-test/t/innodb_skip-master.opt
    1.0 05/04/25 22:36:23 acurtis@stripped +0 -0
    BitKeeper file
/.amd_mnt/bk.anubis/host/work-acurtis/bug7454/mysql-test/t/innodb_skip-master.opt

  mysql-test/r/skip_innodb.require
    1.1 05/04/25 22:36:22 acurtis@stripped +2 -0

  mysql-test/r/innodb_skip.result
    1.1 05/04/25 22:36:22 acurtis@stripped +4 -0

  mysql-test/r/skip_innodb.require
    1.0 05/04/25 22:36:22 acurtis@stripped +0 -0
    BitKeeper file
/.amd_mnt/bk.anubis/host/work-acurtis/bug7454/mysql-test/r/skip_innodb.require

  mysql-test/r/innodb_skip.result
    1.0 05/04/25 22:36:22 acurtis@stripped +0 -0
    BitKeeper file
/.amd_mnt/bk.anubis/host/work-acurtis/bug7454/mysql-test/r/innodb_skip.result

  mysql-test/include/skip_innodb.inc
    1.1 05/04/25 22:36:20 acurtis@stripped +4 -0

  sql/handler.cc
    1.160 05/04/25 22:36:20 acurtis@stripped +7 -6
    Bug#7454
      Make sure that function ha_checktype() always returns an
      enabled storage engine. (amended for merge)

  mysql-test/include/skip_innodb.inc
    1.0 05/04/25 22:36:20 acurtis@stripped +0 -0
    BitKeeper file
/.amd_mnt/bk.anubis/host/work-acurtis/bug7454/mysql-test/include/skip_innodb.inc

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/.amd_mnt/bk.anubis/host/work-acurtis/bug7454

--- 1.159/sql/handler.cc	2005-01-26 14:27:28 +00:00
+++ 1.160/sql/handler.cc	2005-04-25 22:36:20 +01:00
@@ -163,12 +163,13 @@
     break;
   }
   
-  return 
-    DB_TYPE_UNKNOWN != (enum db_type) current_thd->variables.table_type ?
-    (enum db_type) current_thd->variables.table_type :
-    DB_TYPE_UNKNOWN != (enum db_type) global_system_variables.table_type ?
-    (enum db_type) global_system_variables.table_type :
-    DB_TYPE_MYISAM;
+  if (ha_storage_engine_is_enabled(database_type= 
+        (enum db_type) current_thd->variables.table_type))
+    return database_type;
+  if (ha_storage_engine_is_enabled(database_type= 
+        (enum db_type) global_system_variables.table_type))
+    return database_type;
+  return DB_TYPE_MYISAM;
 } /* ha_checktype */
 
 
--- New file ---
+++ mysql-test/include/skip_innodb.inc	05/04/25 22:36:20
-- require r/skip_innodb.require
disable_query_log;
show variables like "have_innodb";
enable_query_log;

--- New file ---
+++ mysql-test/r/innodb_skip.result	05/04/25 22:36:22
create table t1 (a int);
Warnings:
Warning	1266	Using storage engine MyISAM for table 't1'
drop table if exists t1;

--- New file ---
+++ mysql-test/r/skip_innodb.require	05/04/25 22:36:22
Variable_name	Value
have_innodb	DISABLED

--- New file ---
+++ mysql-test/t/innodb_skip-master.opt	05/04/25 22:36:23
--default-storage-engine=innodb --skip-innodb

--- New file ---
+++ mysql-test/t/innodb_skip.test	05/04/25 22:36:23
-- source include/skip_innodb.inc

#
# Bug#7454 - coredump on disabled default storage engine
#
create table t1 (a int);
drop table if exists t1;


--- 1.364/BitKeeper/etc/logging_ok	2005-02-04 11:53:07 +00:00
+++ 1.365/BitKeeper/etc/logging_ok	2005-04-25 22:36:48 +01:00
@@ -8,6 +8,7 @@
 Sinisa@stripped
 WAX@stripped
 acurtis@stripped
+acurtis@stripped
 administrador@stripped
 ahlentz@stripped
 akishkin@stripped