From b70aaf38bc351045af3d2415d94fddf80f2c5e22 Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.ndb.mysql.com>
Date: Tue, 28 Feb 2006 17:51:27 +0100
Subject: [PATCH] Bug #17499 continued - moved initialization of
 used_partitions - more tests

+ removed reference to fixed bugs


mysql-test/r/ndb_partition_range.result:
  Bug #17499 continued
  - more testing
mysql-test/t/disabled.def:
  removed reference to fixed bugs
mysql-test/t/ndb_partition_range.test:
  Bug #17499 continued
  - more testing
sql/ha_ndbcluster.cc:
  Bug #17499 continued
  - moved initialization of used_partitions
sql/sql_partition.cc:
  Bug #17499 continued
  - moved initialization of used_partitions
---
 mysql-test/r/ndb_partition_range.result | 4 +++-
 mysql-test/t/disabled.def               | 8 ++++----
 mysql-test/t/ndb_partition_range.test   | 6 +++++-
 sql/ha_ndbcluster.cc                    | 4 +---
 sql/sql_partition.cc                    | 1 +
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/mysql-test/r/ndb_partition_range.result b/mysql-test/r/ndb_partition_range.result
index e078f38c166..546c0b1196c 100644
--- a/mysql-test/r/ndb_partition_range.result
+++ b/mysql-test/r/ndb_partition_range.result
@@ -159,13 +159,15 @@ a2 TEXT NOT NULL,
 a3 BIT NOT NULL,
 a4 DECIMAL(8,3),
 a5 INT NOT NULL,
-a6 VARCHAR(255),
+a6 INT,
 PRIMARY KEY(a1))
 TABLESPACE ts1 STORAGE DISK ENGINE=NDB
 PARTITION BY LIST (a1)
 (PARTITION p0 VALUES IN (1,2,3,4,5),
 PARTITION p1 VALUES IN (6,7,8,9, 10),
 PARTITION p2 VALUES IN (11, 12, 13, 14, 15));
+ALTER TABLE test.t1 DROP COLUMN a6;
+ALTER TABLE test.t1 ADD COLUMN a6 VARCHAR(255);
 SELECT COUNT(*) FROM test.t1;
 COUNT(*)
 15
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 4845aecb88d..27671548048 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -22,16 +22,16 @@ partition_03ndb         : Bug#16385
 ps_7ndb                 : dbug assert in RBR mode when executing test suite
 rpl_bit_npk             : Bug#13418
 rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly
-rpl_ndb_2innodb         : Bugs#17400, 17687, 17701
-rpl_ndb_2myisam         : Bugs#17400, 17687, 17701
+rpl_ndb_2innodb         : Bugs#17400: delete & update of rows in table without pk fails
+rpl_ndb_2myisam         : Bugs#17400: delete & update of rows in table without pk fails
 rpl_ndb_auto_inc        : Bug#17086
 rpl_ndb_basic           : Bug#16228 [IN REVIEW]
 rpl_ndb_charset         : Bug#17246
 rpl_ndb_ddl             : Bug#17400: delete & update of rows in table without pk fails
 rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
-rpl_ndb_innodb2ndb      : Bugs#17400, 17687, 17701
+rpl_ndb_innodb2ndb      : Bugs#17400: delete & update of rows in table without pk fails
 rpl_ndb_insert_ignore   : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296
-rpl_ndb_myisam2ndb      : Bugs#17400, 17687, 17701
+rpl_ndb_myisam2ndb      : Bugs#17400: delete & update of rows in table without pk fails
 rpl_ndb_log             : result not deterministic
 rpl_ndb_relay_space     : Bug#16993
 rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails
diff --git a/mysql-test/t/ndb_partition_range.test b/mysql-test/t/ndb_partition_range.test
index 66235b0e9eb..5b70b26c97b 100644
--- a/mysql-test/t/ndb_partition_range.test
+++ b/mysql-test/t/ndb_partition_range.test
@@ -140,7 +140,7 @@ CREATE TABLE test.t1 (
   a3 BIT NOT NULL,
   a4 DECIMAL(8,3),
   a5 INT NOT NULL,
-  a6 VARCHAR(255),
+  a6 INT,
   PRIMARY KEY(a1))
   TABLESPACE ts1 STORAGE DISK ENGINE=NDB
   PARTITION BY LIST (a1)
@@ -148,6 +148,10 @@ CREATE TABLE test.t1 (
   PARTITION p1 VALUES IN (6,7,8,9, 10),
   PARTITION p2 VALUES IN (11, 12, 13, 14, 15));
 
+# Alter table directly without any statements inbetween
+ALTER TABLE test.t1 DROP COLUMN a6;
+ALTER TABLE test.t1 ADD COLUMN a6 VARCHAR(255);
+
 let $j= 15;
 --disable_query_log
 while ($j)
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index c849b73221a..17b999f8134 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -5176,10 +5176,8 @@ int ha_ndbcluster::open(const char *name, int mode, uint test_if_locked)
   
   res= get_metadata(name);
   if (!res)
-  {
     info(HA_STATUS_VARIABLE | HA_STATUS_CONST);
-    extra(HA_EXTRA_RESET);
-  }
+
   DBUG_RETURN(res);
 }
 
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 07ca28c69bc..445b243fdc5 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -1414,6 +1414,7 @@ static bool set_up_partition_bitmap(THD *thd, partition_info *part_info)
     DBUG_RETURN(TRUE);
   }
   bitmap_init(&part_info->used_partitions, bitmap_buf, bitmap_bytes*8, FALSE);
+  bitmap_set_all(&part_info->used_partitions);
   DBUG_RETURN(FALSE);
 }