bzr push into mysql-5.5-cluster branch (jonas.oreland:3418 to 3420)

[Jonas Oreland]

 3420 Jonas Oreland	2011-07-05
      ndb - more valgrind suppressions for compress

    modified:
      mysql-test/valgrind.supp
 3419 Jonas Oreland	2011-07-05
      ndb - rbwr - don't do it if index is MAX_KEY

    modified:
      sql/sql_update.cc
 3418 jonas oreland	2011-07-04 [merge]
      ndb - merge 70-spj into 55

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_push.cc
      sql/ha_ndbcluster_push.h
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-07-04 08:03:49 +0000
+++ b/mysql-test/valgrind.supp	2011-07-05 07:46:32 +0000
@@ -903,3 +903,27 @@
    fun:packfrm
 }
 
+#
+# pfs vs compress
+#
+{
+   pfs vs. compress case 1
+   Memcheck:Cond
+   fun:longest_match
+   fun:deflate_slow
+   fun:deflate
+   fun:compress
+   fun:my_compress_alloc
+   fun:my_compress
+}
+
+{
+   pfs vs. compress case 2
+   Memcheck:Cond
+   fun:deflate_slow
+   fun:deflate
+   fun:compress
+   fun:my_compress_alloc
+   fun:my_compress
+}
+

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2011-06-09 12:14:22 +0000
+++ b/sql/sql_update.cc	2011-07-05 07:42:45 +0000
@@ -465,7 +465,7 @@ int mysql_update(THD *thd,
     available in select->quick, but where?)
   */
   bool read_removal= false;
-  if (select && select->quick &&
+  if (select && select->quick && select->quick->index != MAX_KEY &&
       !ignore &&
       !using_limit &&
       table->file->read_before_write_removal_supported())

No bundle (reason: useless for push emails).