Commit 9479462b authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-fix
parents 1a7be737 9224719d

sql/sql_table.cc

+2 −0
Original line number Diff line number Diff line
@@ -5009,6 +5009,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, 
  old_db_type= table->s->db_type;

  if (!create_info->db_type)

  {

#ifdef WITH_PARTITION_STORAGE_ENGINE

    if (table->part_info &&

        create_info->used_fields & HA_CREATE_USED_ENGINE)

    {
@@ -5022,6 +5023,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, 
      create_info->db_type= table->part_info->default_engine_type;

    }

    else

#endif

      create_info->db_type= old_db_type;

  }