Commit 409f0229 authored by unknown's avatar unknown
Browse files

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sql_partition.cc:
  Auto merged
parents 0466a909 b70aaf38

mysql-test/r/ndb_partition_range.result

+3 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/t/disabled.def

+4 −4
Original line number Diff line number Diff line
@@ -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

mysql-test/t/ndb_partition_range.test

+5 −1
Original line number Diff line number Diff line
@@ -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)

sql/sql_partition.cc

+1 −0
Original line number Diff line number Diff line
@@ -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);

}