bk commit into 4.1 tree (acurtis:1.2207)

[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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2207 05/04/25 22:39:38 acurtis@stripped +2 -0
  Merge xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug7454
  into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug7454.1

  sql/handler.cc
    1.163 05/04/25 22:39:34 acurtis@stripped +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.378 05/04/25 22:38:45 acurtis@stripped +0 -1
    auto-union

# 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/RESYNC

--- 1.162/sql/handler.cc	2005-04-16 01:40:26 +01:00
+++ 1.163/sql/handler.cc	2005-04-25 22:39:34 +01:00
@@ -177,12 +177,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 */