bk commit into 5.1 tree (petr:1.2247)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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-08 12:03:24+04:00, petr@stripped +1 -0
  Fix windows pushbuild failure: the bug occured because
  we didn't check for NULL value of the
  lex_create_info->db_type pointer.
  The pointer is NULL in the case, when the engine name is
  unknown to the server. This happens with NDB on Windows.

  sql/sql_table.cc@stripped, 2006-08-08 12:03:20+04:00, petr@stripped +2 -1
    don't check pointer in the case, it is NULL

# 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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/devel/5.1-curs-bug

--- 1.363/sql/sql_table.cc	2006-08-08 12:03:36 +04:00
+++ 1.364/sql/sql_table.cc	2006-08-08 12:03:36 +04:00
@@ -5043,8 +5043,9 @@ bool mysql_alter_table(THD *thd,char *ne
     /* Disable alter of log tables to unsupported engine */
     if ((table_kind == GENERAL_LOG || table_kind == SLOW_LOG) &&
         (lex_create_info->used_fields & HA_CREATE_USED_ENGINE) &&
+        (!lex_create_info->db_type || /* unknown engine */
         !(lex_create_info->db_type->db_type == DB_TYPE_MYISAM ||
-          lex_create_info->db_type->db_type == DB_TYPE_CSV_DB))
+          lex_create_info->db_type->db_type == DB_TYPE_CSV_DB)))
     {
       my_error(ER_BAD_LOG_ENGINE, MYF(0));
       DBUG_RETURN(TRUE);