bk commit into 5.1 tree (serg:1.2586)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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-04-27 14:13:34-07:00, serg@stripped +3 -0
  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@stripped, 2007-04-27 14:13:29-07:00, serg@stripped +2 -2
    provide the writable datadir for mysqld --help (for lower_case test)

  sql/log.h@stripped, 2007-04-27 14:13:29-07:00, serg@stripped +3 -3
    make default binlog_format value to be 0 (for a hack of using
    GET_STR for enum to continue to work)

  sql/mysqld.cc@stripped, 2007-04-27 14:13:30-07:00, serg@stripped +1 -1
    make default binlog_format value to be 0 (for a hack of using
    GET_STR for enum to continue to work)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	sergbook.mysql.com
# Root:	/usr/home/serg/Abk/mysql-5.1-wl2936

--- 1.632/sql/mysqld.cc	2007-04-27 14:13:47 -07:00
+++ 1.633/sql/mysqld.cc	2007-04-27 14:13:47 -07:00
@@ -399,7 +399,7 @@
 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 };

--- 1.295/mysql-test/mysql-test-run.pl	2007-04-27 14:13:47 -07:00
+++ 1.296/mysql-test/mysql-test-run.pl	2007-04-27 14:13:47 -07:00
@@ -666,6 +666,7 @@
     $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 @@
   # --------------------------------------------------------------------------
   # 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 @@
   # --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))
   {

--- 1.24/sql/log.h	2007-04-27 14:13:47 -07:00
+++ 1.25/sql/log.h	2007-04-27 14:13:47 -07:00
@@ -603,13 +603,13 @@
 };
 
 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