From: Date: August 16 2006 5:07pm
Subject: bk commit into 5.1 tree (gluh:1.2271) BUG#20871
List-Archive: http://lists.mysql.com/commits/10550
X-Bug: 20871
Message-Id: <20060816150722.06ADA2A0AFD@gluh.myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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@stripped, 2006-08-16 20:07:12+05:00, gluh@stripped +1 -0
  Bug#20871 Partitions: crash if --skip-innodb
  return error if engine is disabled

  sql/table.cc@stripped, 2006-08-16 20:07:08+05:00, gluh@stripped +4 -2
    Bug#20871 Partitions: crash if --skip-innodb
    return error if engine is disabled

# 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:	gluh
# Host:	gluh.(none)
# Root:	/home/gluh/MySQL/Merge/5.1-kt

--- 1.239/sql/table.cc	2006-08-16 20:07:21 +05:00
+++ 1.240/sql/table.cc	2006-08-16 20:07:21 +05:00
@@ -456,8 +456,10 @@
     share->frm_version= FRM_VER_TRUE_VARCHAR;
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE
-  share->default_part_db_type= 
-        ha_checktype(thd, (enum legacy_db_type) (uint) *(head+61), 0, 0);
+  if (*(head+61) &&
+      !(share->default_part_db_type= 
+        ha_checktype(thd, (enum legacy_db_type) (uint) *(head+61), 1, 0)))
+    goto err;
   DBUG_PRINT("info", ("default_part_db_type = %u", head[61]));
 #endif
   legacy_db_type= (enum legacy_db_type) (uint) *(head+3);