Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51


BitKeeper/etc/ignore:
  auto-union
client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/comp_err.c:
  Auto merged
include/my_time.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/tztime.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use local
mysql-test/t/mysqlbinlog.test:
  Use local

client/mysql_upgrade.c

@@ -463,8 +463,9 @@ int main(int argc, char **argv)
   char *forced_defaults_file;
   char *forced_extra_defaults;
   char *local_defaults_group_suffix;
-
+  int no_defaults;
   char path[FN_REFLEN], upgrade_defaults_path[FN_REFLEN];
+
   DYNAMIC_STRING cmdline;
 
   MY_INIT(argv[0]);
@@ -586,7 +587,9 @@ int main(int argc, char **argv)
     instruct mysqlcheck to only read options from that file
   */
   dynstr_append(&cmdline, " ");
-  dynstr_append_os_quoted(&cmdline, "--defaults-file=",
+  dynstr_append_os_quoted(&cmdline,
+                          (no_defaults ? "--defaults-file=" :
+                           "--defaults-extra-file="),
                           upgrade_defaults_path, NullS);
   dynstr_append(&cmdline, " ");
   dynstr_append_os_quoted(&cmdline, "--check-upgrade", NullS);
@@ -661,7 +664,9 @@ int main(int argc, char **argv)
     instruct mysql to only read options from that file
   */
   dynstr_append(&cmdline, " ");
-  dynstr_append_os_quoted(&cmdline, "--defaults-file=",
+  dynstr_append_os_quoted(&cmdline,
+                          (no_defaults ? "--defaults-file=" :
+                           "--defaults-extra-file="),
                           upgrade_defaults_path, NullS);
   dynstr_append(&cmdline, " ");
   dynstr_append_os_quoted(&cmdline, "--force", NullS);

client/mysqltest.c

@@ -1700,12 +1700,14 @@ void do_exec(struct st_command *command)
   }
 
 #ifdef __WIN__
+#ifndef USE_CYGWIN
   /* Replace /dev/null with NUL */
   while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0)
     ;
   /* Replace "closed stdout" with non existing output fd */
   while(replace(&ds_cmd, ">&-", 3, ">&4", 3) == 0)
     ;
+#endif
 #endif
 
   DBUG_PRINT("info", ("Executing '%s' as '%s'",
@@ -1870,10 +1872,12 @@ void do_system(struct st_command *command)
   do_eval(&ds_cmd, command->first_argument, command->end, !is_windows);
 
 #ifdef __WIN__
+#ifndef USE_CYGWIN
    /* Replace /dev/null with NUL */
    while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0)
      ;
 #endif
+#endif
 
 
   DBUG_PRINT("info", ("running system command '%s' as '%s'",
@@ -5964,7 +5968,9 @@ int main(int argc, char **argv)
 
   init_builtin_echo();
 #ifdef __WIN__
+#ifndef USE_CYGWIN
   is_windows= 1;
+#endif
   init_tmp_sh_file();
   init_win_path_patterns();
 #endif

mysql-test/lib/mtr_misc.pl

@@ -68,6 +68,12 @@ sub mtr_short_hostname () {
 sub mtr_native_path($)
 {
   my $path= shift;
+
+  # MySQL version before 5.0 still use cygwin, no need
+  # to convert path
+  return $path
+    if ($::mysql_version_id < 50000);
+
   $path=~ s/\//\\/g
     if ($::glob_win32);
   return $path;