bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3955 to 3957)

[John David Duncan]

 3957 John David Duncan	2012-06-27 [merge]
      local merge

    modified:
      mysql-test/suite/ndb_memcache/r/ttls_flags.result
      storage/ndb/memcache/unit/extvals.pl
 3956 John David Duncan	2012-06-27 [merge]
      local merge

    modified:
      storage/ndb/memcache/src/ExternalValue.cc
      storage/ndb/memcache/src/ndb_worker.cc
 3955 magnus.blaudd@stripped	2012-06-27 [merge]
      Merge 7.1 -> 7.2

    modified:
      mysql-test/suite/ndb/t/ndb_reconnect.test
=== modified file 'mysql-test/suite/ndb_memcache/r/ttls_flags.result'
--- a/mysql-test/suite/ndb_memcache/r/ttls_flags.result	2011-12-11 07:31:26 +0000
+++ b/mysql-test/suite/ndb_memcache/r/ttls_flags.result	2012-06-28 00:45:13 +0000
@@ -3,6 +3,6 @@ Flags Test OK 
 USE ndbmemcache;
 SELECT * FROM demo_table_tabs order by mkey;
 mkey	val1	val2	val3	flags	expire_time
-1	Groen	NULL	NULL	NULL	NULL
+1	Groen	NULL	NULL	0	NULL
 12	Con	Brio	NULL	100	NULL
 13	Sul ponticello	NULL	NULL	200	NULL

=== modified file 'storage/ndb/memcache/src/ExternalValue.cc'
--- a/storage/ndb/memcache/src/ExternalValue.cc	2012-04-05 21:00:05 +0000
+++ b/storage/ndb/memcache/src/ExternalValue.cc	2012-05-18 00:07:06 +0000
@@ -581,8 +581,7 @@ void ExternalValue::setMiscColumns(Opera
   /* Set flags */
   if(wqitem->prefix_info.has_flags_col) {
     uint32_t flags = hash_item_get_flags(wqitem->cache_item);
-    if(flags)
-      op.setColumnInt(COL_STORE_FLAGS, ntohl(flags));
+    op.setColumnInt(COL_STORE_FLAGS, ntohl(flags));
   }
 }
 

=== modified file 'storage/ndb/memcache/src/ndb_worker.cc'
--- a/storage/ndb/memcache/src/ndb_worker.cc	2012-04-14 00:53:04 +0000
+++ b/storage/ndb/memcache/src/ndb_worker.cc	2012-05-18 00:07:06 +0000
@@ -397,8 +397,7 @@ op_status_t WorkerStep1::do_write() {
   /* Set flags */
   if(wqitem->prefix_info.has_flags_col) {
     uint32_t flags = hash_item_get_flags(wqitem->cache_item);
-    if(flags)
-      op.setColumnInt(COL_STORE_FLAGS, ntohl(flags));
+    op.setColumnInt(COL_STORE_FLAGS, ntohl(flags));
   }
   
   /* Start the transaction */

=== modified file 'storage/ndb/memcache/unit/extvals.pl'
--- a/storage/ndb/memcache/unit/extvals.pl	2011-12-12 21:34:19 +0000
+++ b/storage/ndb/memcache/unit/extvals.pl	2012-06-28 00:45:13 +0000
@@ -193,3 +193,10 @@ if($do_test=='11' || $do_all) {
   $mc->set("b:testtoobig", $val_too_big);
   $mc->{error} =~ "VALUE_TOO_LARGE" || Carp::confess "Expected TOO_LARGE";
 }
+
+if($do_test=='12' || $do_all) {
+  # Test SET with flags
+  $mc->set_flags(0);
+  $mc->set("b:test12", "Mikrokosmos");
+}
+

No bundle (reason: useless for push emails).