bzr push into mysql-5.1 branch (mattias.jonsson:2696 to 2697)

[Mattias Jonsson]

 2697 Mattias Jonsson	2008-11-06
      post push fix, removing dbug_print due to compiler warning
modified:
  sql/ha_partition.cc

 2696 Mattias Jonsson	2008-11-06 [merge]
      merge
added:
  mysql-test/r/partition_innodb_stmt.result
  mysql-test/t/partition_innodb_stmt.test
modified:
  mysql-test/suite/parts/inc/partition_auto_increment.inc
  mysql-test/suite/parts/inc/partition_mgm.inc
  mysql-test/suite/parts/r/partition_auto_increment_archive.result
  mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
  mysql-test/suite/parts/r/partition_auto_increment_innodb.result
  mysql-test/suite/parts/r/partition_auto_increment_memory.result
  mysql-test/suite/parts/r/partition_auto_increment_myisam.result
  mysql-test/suite/parts/r/partition_auto_increment_ndb.result
  mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
  mysql-test/suite/parts/t/partition_mgm_lc0_archive.test
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  storage/archive/ha_archive.cc

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2008-11-05 20:13:54 +0000
+++ b/sql/ha_partition.cc	2008-11-06 12:47:41 +0000
@@ -2469,8 +2469,6 @@ int ha_partition::open(const char *name,
                                     ~(PARTITION_DISABLED_TABLE_FLAGS)) |
                                    (PARTITION_ENABLED_TABLE_FLAGS)))
     {
-      DBUG_PRINT("error", ("check_table_flag 0x%x != 0x%x table_flags()",
-                           check_table_flags, (*file)->ha_table_flags()));
       error= HA_ERR_INITIALIZATION;
       goto err_handler;
     }