From: magnus.blaudd
Date: June 13 2011 12:37pm
Subject: bzr push into mysql-5.5-cluster branch (magnus.blaudd:3354 to 3355)
List-Archive: http://lists.mysql.com/commits/139156
Message-Id: <20110613123701.B790513402B@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3355 magnus.blaudd@stripped	2011-06-13 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
 3354 magnus.blaudd@stripped	2011-06-09
      WL#5906 read before write removal (RBWR)
       - Add MCP patch for read removal in MySQL Servers
         update and delete loops.
       - Slightly modified version compared to 7.0 where this
         version checks the limitations of the algorithm in the MySQL
         Server code and only the limitations of NDB is done in ha_ndbcluster
       - Update test result slightly after merging in patch
         for bug#37153 rewrite

    modified:
      mysql-test/suite/ndb/r/ndb_update_no_read.result
      mysql-test/suite/ndb/t/disabled.def
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_glue.h
      sql/handler.h
      sql/sql_delete.cc
      sql/sql_update.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_read_multi_range.result'
--- a/mysql-test/suite/ndb/r/ndb_read_multi_range.result	2011-02-28 10:42:04 +0000
+++ b/mysql-test/suite/ndb/r/ndb_read_multi_range.result	2011-05-19 10:25:14 +0000
@@ -559,7 +559,7 @@ a
 4
 drop table t1;
 create table t1 (a varchar(1536) not null,
-b varchar(1536) not null,
+b varchar(1532) not null,
 c int, primary key (a,b)) engine=ndb;
 insert into t1 values ('a', 'a', 1), ('b', 'b', 2), ('c', 'c', 3),
 ('d', 'd', 4), ('e', 'e', 5), ('f', 'f', 6),
@@ -605,7 +605,7 @@ SELECT DISTINCT STRAIGHT_JOIN t1.pk FROM
 t1 LEFT JOIN t2 ON t2.a = t1.a AND t2.pk != 6;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3000	Using temporary
-1	SIMPLE	t2	range	PRIMARY	PRIMARY	4	NULL	6	Using where; Distinct
+1	SIMPLE	t2	range	PRIMARY	PRIMARY	4	NULL	4	Using where; Distinct
 SELECT DISTINCT STRAIGHT_JOIN t1.pk FROM 
 t1 LEFT JOIN t2 ON t2.a = t1.a AND t2.pk != 6;
 drop table t1, t2;

=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2011-06-09 12:14:22 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2011-06-13 12:36:36 +0000
@@ -26,8 +26,6 @@ ndb_index_ordered	 : SEAGULL alter in se
 ndb_index_unique	 : SEAGULL different error with copying alter
 ndb_alter_table3	 : SEAGULL different error with copying alter
 
-ndb_read_multi_range      : SEAGULL "total length of the partitioning fields is too large"
-
 ndb_multi		 : SEAGULL schema distribution 
 
 ndb_sql_allow_batching   : SEAGULL WL3733 xxx_allow_batching

=== modified file 'mysql-test/suite/ndb/t/ndb_read_multi_range.test'
--- a/mysql-test/suite/ndb/t/ndb_read_multi_range.test	2010-11-24 17:45:27 +0000
+++ b/mysql-test/suite/ndb/t/ndb_read_multi_range.test	2011-05-19 10:25:14 +0000
@@ -407,7 +407,7 @@ order by a;
 drop table t1;
 
 create table t1 (a varchar(1536) not null,
-                 b varchar(1536) not null,
+                 b varchar(1532) not null,
                  c int, primary key (a,b)) engine=ndb;
 insert into t1 values ('a', 'a', 1), ('b', 'b', 2), ('c', 'c', 3),
                       ('d', 'd', 4), ('e', 'e', 5), ('f', 'f', 6),

No bundle (reason: useless for push emails).