From 7dfd5e8d71c2c310ad6d7f68a3520e364c750fe8 Mon Sep 17 00:00:00 2001
From: "serg@sergbook.mysql.com" <>
Date: Fri, 27 Apr 2007 14:13:34 -0700
Subject: [PATCH] mysql-test/mysql-test-run.pl     provide the writable datadir
 for mysqld --help (for lower_case test) sql/log.h, sql/mysqld.cc     make
 default binlog_format value to be 0 (for a hack of using     GET_STR for enum
 to continue to work)

---
 mysql-test/mysql-test-run.pl | 4 ++--
 sql/log.h                    | 6 +++---
 sql/mysqld.cc                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4306a5ade77..b4a3270294c 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -666,6 +666,7 @@ sub command_line_setup () {
     $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`;
     chomp($glob_mysql_test_dir);
   }
+  $default_vardir= "$glob_mysql_test_dir/var";
 
   # In most cases, the base directory we find everything relative to,
   # is the parent directory of the "mysql-test" directory. For source
@@ -838,7 +839,6 @@ sub command_line_setup () {
   # --------------------------------------------------------------------------
   # Set the "var/" directory, as it is the base for everything else
   # --------------------------------------------------------------------------
-  $default_vardir= "$glob_mysql_test_dir/var";
   if ( ! $opt_vardir )
   {
     $opt_vardir= $default_vardir;
@@ -1361,7 +1361,7 @@ sub collect_mysqld_features () {
   # --no-defaults and --skip-grant-tables are to avoid loading
   # system-wide configs and plugins
   #
-  my $list= `$exe_mysqld --no-defaults --language=$path_language --skip-grant-tables --verbose --help`;
+  my $list= `$exe_mysqld --no-defaults --datadir=$default_vardir --language=$path_language --skip-grant-tables --verbose --help`;
 
   foreach my $line (split('\n', $list))
   {
diff --git a/sql/log.h b/sql/log.h
index ed0c3557d08..25bcbd6c62d 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -603,13 +603,13 @@ public:
 };
 
 enum enum_binlog_format {
-  BINLOG_FORMAT_STMT= 0, // statement-based
-  BINLOG_FORMAT_ROW= 1, // row_based
   /*
     statement-based except for cases where only row-based can work (UUID()
     etc):
   */
-  BINLOG_FORMAT_MIXED= 2,
+  BINLOG_FORMAT_MIXED= 0,
+  BINLOG_FORMAT_STMT= 1, // statement-based
+  BINLOG_FORMAT_ROW= 2, // row_based
 /*
   This value is last, after the end of binlog_format_typelib: it has no
   corresponding cell in this typelib. We use this value to be able to know if
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ff25b78c1ca..d9dff178d24 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -399,7 +399,7 @@ my_bool opt_noacl;
 my_bool sp_automatic_privileges= 1;
 
 ulong opt_binlog_rows_event_max_size;
-const char *binlog_format_names[]= {"STATEMENT", "ROW", "MIXED", NullS};
+const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS};
 TYPELIB binlog_format_typelib=
   { array_elements(binlog_format_names) - 1, "",
     binlog_format_names, NULL };