bk commit into 5.1 tree (tomas:1.2201) BUG#17499

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2201 06/02/28 17:51:27 tomas@stripped +5 -0
  Bug #17499 continued
  - moved initialization of used_partitions
  - more tests
  
  + removed reference to fixed bugs

  sql/sql_partition.cc
    1.43 06/02/28 17:51:20 tomas@stripped +1 -0
    Bug #17499 continued
    - moved initialization of used_partitions

  sql/ha_ndbcluster.cc
    1.278 06/02/28 17:51:20 tomas@stripped +1 -3
    Bug #17499 continued
    - moved initialization of used_partitions

  mysql-test/t/ndb_partition_range.test
    1.6 06/02/28 17:51:20 tomas@stripped +5 -1
    Bug #17499 continued
    - more testing

  mysql-test/t/disabled.def
    1.87 06/02/28 17:51:20 tomas@stripped +4 -4
    removed reference to fixed bugs

  mysql-test/r/ndb_partition_range.result
    1.9 06/02/28 17:51:20 tomas@stripped +3 -1
    Bug #17499 continued
    - more testing

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.86/mysql-test/t/disabled.def	2006-02-27 15:07:05 +01:00
+++ 1.87/mysql-test/t/disabled.def	2006-02-28 17:51:20 +01:00
@@ -22,16 +22,16 @@
 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

--- 1.277/sql/ha_ndbcluster.cc	2006-02-28 16:27:27 +01:00
+++ 1.278/sql/ha_ndbcluster.cc	2006-02-28 17:51:20 +01:00
@@ -5176,10 +5176,8 @@
   
   res= get_metadata(name);
   if (!res)
-  {
     info(HA_STATUS_VARIABLE | HA_STATUS_CONST);
-    extra(HA_EXTRA_RESET);
-  }
+
   DBUG_RETURN(res);
 }
 

--- 1.8/mysql-test/r/ndb_partition_range.result	2006-02-28 12:28:46 +01:00
+++ 1.9/mysql-test/r/ndb_partition_range.result	2006-02-28 17:51:20 +01:00
@@ -159,13 +159,15 @@
 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

--- 1.5/mysql-test/t/ndb_partition_range.test	2006-02-28 12:28:46 +01:00
+++ 1.6/mysql-test/t/ndb_partition_range.test	2006-02-28 17:51:20 +01:00
@@ -140,13 +140,17 @@
   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 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

--- 1.42/sql/sql_partition.cc	2006-02-28 12:29:44 +01:00
+++ 1.43/sql/sql_partition.cc	2006-02-28 17:51:20 +01:00
@@ -1414,6 +1414,7 @@
     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);
 }