Merge bk-internal:/home/bk/mysql-5.1-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

mysql-test/include/is_debug_build.inc

--- require r/is_debug_build.require
---disable_query_log
-select instr(version(), "debug") > 0;
---enable_query_log

mysql-test/include/uses_vardir.inc

@@ -7,9 +7,8 @@
 # outside of it's vardir anyway
 #
 
-let $datadir=
-  query_get_value("SHOW VARIABLES LIKE 'datadir'", Value, 1);
-if (`select LOCATE("$MYSQLTEST_VARDIR", "$datadir") != 1`)
+
+if (`select LOCATE('$MYSQLTEST_VARDIR', REPLACE(@@datadir, '\\\\', '/')) != 1`)
 {
   skip Need mysqld in MYSQLTEST_VARDIR;
 }

mysql-test/lib/mtr_cases.pl

@@ -607,9 +607,12 @@ sub collect_one_test_case($$$$$$$) {
     }
     else
     {
-      # Test does not need binlog, add --skip-binlog to
-      # the options used when starting it
-      push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
+      if ( $::mysql_version_id >= 50100 )
+      {
+	# Test does not need binlog, add --skip-binlog to
+	# the options used when starting it
+	push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
+      }
     }
 
   }

mysql-test/mysql-test-run.pl

@@ -771,7 +771,7 @@ sub command_line_setup () {
   # Find out type of logging that are being used
   # --------------------------------------------------------------------------
   # NOTE if the default binlog format is changed, this has to be changed
-  $used_binlog_format= "stmt";
+  $used_binlog_format= "statement";
   if (!$opt_extern && $mysql_version_id >= 50100 )
   {
     $used_binlog_format= "mixed"; # Default value for binlog format

mysql-test/t/sp-code.test

@@ -2,7 +2,7 @@
 # Test the debugging feature "show procedure/function code <name>" 
 #
 
--- source include/is_debug_build.inc
+-- source include/have_debug.inc
 
 --disable_warnings
 drop procedure if exists empty;