Bug #57603 slave_allow_batching uses same bit in thd->options as profiling

Description:
The OPTION_ALLOW_BATCHING bitmask has got same value as OPTION_PROFILING which causes slave_allow_batching to affect profiling and vice versa.

How to repeat:
MCI

Suggested fix:
Change so that OPTION_ALLOW_BATCH does not use the same value/bit as OPTION_PROFILING

=== modified file 'sql/mysql_priv.h'
--- sql/mysql_priv.h	2010-10-20 13:35:30 +0000
+++ sql/mysql_priv.h	2010-10-20 13:35:37 +0000
@@ -511,7 +511,7 @@ enum open_table_mode
   Dont report errors for individual rows,
   But just report error on commit (or read ofcourse)
 */
-#define OPTION_ALLOW_BATCH              (ULL(1) << 33) // THD, intern (slave)
+#define OPTION_ALLOW_BATCH              (ULL(1) << 34) // THD, intern (slave)
 #endif
 
 /**

A patch for this bug has been committed. After review, it may
be pushed to the relevant source trees for release in the next
version. You can access the patch from:

  http://lists.mysql.com/commits/121329

Pushed into mysql-5.1-telco-6.2 5.1.51-ndb-6.2.19 (revid:magnus.blaudd@sun.com-20101020133640-jnjcp9m5aozgnfr1) (version source revid:magnus.blaudd@sun.com-20101020133640-jnjcp9m5aozgnfr1) (merge vers: 5.1.51-ndb-6.2.19) (pib:21)

Pushed into mysql-5.1-telco-6.3 5.1.51-ndb-6.3.39 (revid:magnus.blaudd@sun.com-20101020140108-301980ga6cdc25rf) (version source revid:magnus.blaudd@sun.com-20101020140108-301980ga6cdc25rf) (merge vers: 5.1.51-ndb-6.3.39) (pib:21)

Pushed into mysql-5.1-telco-7.0 5.1.51-ndb-7.0.20 (revid:magnus.blaudd@sun.com-20101020152127-k6j3ow43t6xom65t) (version source revid:magnus.blaudd@sun.com-20101020140609-l5wxzbg8brcfjq0o) (merge vers: 5.1.51-ndb-7.0.20) (pib:21)

Pushed to 6.3.39, 7.0.20 and 7.1.9

Documented as follows in the NDB-6.3.39, 7.0.20, and 7.1.9 changelogs:

      The OPTION_ALLOW_BATCHING bitmask had the same value as 
      OPTION_PROFILING. This caused conflicts between use of the 
      --slave_allow_batching option and profiling.

Closed.