From: Date: October 30 2007 4:22pm
Subject: bk commit into 5.1 tree (tomas:1.2681) BUG#19227
List-Archive: http://lists.mysql.com/commits/36664
X-Bug: 19227
Message-Id: <20071030152211.CD9DB180E7247@linux.local>

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@stripped, 2007-10-30 16:22:06+01:00, tomas@stripped +1 -0
  bug#19227
  - small correction to harmonize code

  sql/ha_ndbcluster.h@stripped, 2007-10-30 16:22:03+01:00, tomas@stripped +11 -5
    bug#19227
    - small correction to harmonize code

diff -Nrup a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
--- a/sql/ha_ndbcluster.h	2007-10-30 12:53:56 +01:00
+++ b/sql/ha_ndbcluster.h	2007-10-30 16:22:03 +01:00
@@ -187,20 +187,26 @@ struct Ndb_tuple_id_range_guard {
 
 #ifdef HAVE_NDB_BINLOG
 /* NDB_SHARE.flags */
-#define NSF_HIDDEN_PK 1 /* table has hidden primary key */
-#define NSF_BLOB_FLAG 2 /* table has blob attributes */
-#define NSF_NO_BINLOG 4 /* table should not be binlogged */
-#define NSF_BINLOG_FULL        8 /* table should be binlogged with full rows */
-#define NSF_BINLOG_USE_UPDATE 16  /* table update should be binlogged using
+#define NSF_HIDDEN_PK   1u /* table has hidden primary key */
+#define NSF_BLOB_FLAG   2u /* table has blob attributes */
+#define NSF_NO_BINLOG   4u /* table should not be binlogged */
+#define NSF_BINLOG_FULL 8u /* table should be binlogged with full rows */
+#define NSF_BINLOG_USE_UPDATE 16u  /* table update should be binlogged using
                                      update log event */
+inline void set_binlog_logging(NDB_SHARE *share)
+{ share->flags&= ~NSF_NO_BINLOG; }
 inline void set_binlog_nologging(NDB_SHARE *share)
 { share->flags|= NSF_NO_BINLOG; }
 inline my_bool get_binlog_nologging(NDB_SHARE *share)
 { return (share->flags & NSF_NO_BINLOG) != 0; }
+inline void set_binlog_updated_only(NDB_SHARE *share)
+{ share->flags&= ~NSF_BINLOG_FULL; }
 inline void set_binlog_full(NDB_SHARE *share)
 { share->flags|= NSF_BINLOG_FULL; }
 inline my_bool get_binlog_full(NDB_SHARE *share)
 { return (share->flags & NSF_BINLOG_FULL) != 0; }
+inline void set_binlog_use_write(NDB_SHARE *share)
+{ share->flags&= ~NSF_BINLOG_USE_UPDATE; }
 inline void set_binlog_use_update(NDB_SHARE *share)
 { share->flags|= NSF_BINLOG_USE_UPDATE; }
 inline my_bool get_binlog_use_update(NDB_SHARE *share)