bzr push into mysql-6.0 branch (kostja:2719 to 2720) Bug#36072

[Konstantin Osipov]

 2720 Konstantin Osipov	2008-10-02
      Bug #36072 Two constants having same value in THD::options
      Change OPTION_ALLOW_BATCH to bit 34.
modified:
  sql/mysql_priv.h

 2719 Konstantin Osipov	2008-10-02
      Bug #34818 --default-table-type option should be removed
      Remove the deprecated option.
modified:
  sql/mysqld.cc

=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2008-09-05 14:16:07 +0000
+++ b/sql/mysql_priv.h	2008-10-02 19:52:19 +0000
@@ -521,7 +521,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)
 
 /**
   Maximum length of time zone name that we support