bzr commit into mysql-5.5 branch (magnus.blaudd:3089) Bug#57604

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-bug57604/ based on revid:alexander.nozdrin@strippedit9qoxbb

 3089 Magnus Blåudd	2010-10-20
      Bug#57604  Reserve bit in option_bits for slave_allow_batching feature
       - Add  define to reserve bit number 36 for slave_allow_batching feature

    modified:
      sql/sql_priv.h
=== modified file 'sql/sql_priv.h'
--- a/sql/sql_priv.h	2010-08-05 12:53:09 +0000
+++ b/sql/sql_priv.h	2010-10-20 13:54:58 +0000
@@ -144,6 +144,12 @@
 */
 #define OPTION_MASTER_SQL_ERROR (1ULL << 35)
 
+/*
+  Dont report errors for individual rows,
+  But just report error on commit (or read ofcourse)
+  Note! Reserved for use in MySQL Cluster
+*/
+#define OPTION_ALLOW_BATCH              (ULL(1) << 36) // THD, intern (slave)
 
 /* The rest of the file is included in the server only */
 #ifndef MYSQL_CLIENT

Attachment: [text/bzr-bundle] bzr/[e-mail]