From: Date: April 24 2006 1:31pm
Subject: bk commit into 5.1 tree (tomas:1.2354) BUG#18603
List-Archive: http://lists.mysql.com/commits/5386
X-Bug: 18603
Message-Id: <20060424113136.E88C77FDCD@poseidon.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2354 06/04/24 13:31:24 tomas@stripped +1 -0
  Bug #18603  	Lost connection on poorly formed "create logfile" and "create tablespace"

  sql/sql_tablespace.cc
    1.3 06/04/24 13:31:17 tomas@stripped +2 -1
    Bug #18603  	Lost connection on poorly formed "create logfile" and "create tablespace"

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.2/sql/sql_tablespace.cc	2006-01-11 19:49:27 +01:00
+++ 1.3/sql/sql_tablespace.cc	2006-04-24 13:31:17 +02:00
@@ -28,7 +28,8 @@
     If the user haven't defined an engine, this will fallback to using the
     default storage engine.
   */
-  hton= ha_resolve_by_legacy_type(thd, ts_info->storage_engine);
+  hton= ha_resolve_by_legacy_type(thd, ts_info->storage_engine != DB_TYPE_UNKNOWN ?
+                                  ts_info->storage_engine : DB_TYPE_DEFAULT);
 
   if (hton->state == SHOW_OPTION_YES &&
       hton->alter_tablespace && (error= hton->alter_tablespace(thd, ts_info)))