List:Commits« Previous MessageNext Message »
From:msvensson Date:October 31 2006 4:16pm
Subject:bk commit into 4.1 tree (msvensson:1.2611)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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, 2006-10-31 17:16:07+01:00, msvensson@shellback.(none) +1 -0
  Remove warning, exe_mysql_fix_system_tables are not available on windows

  mysql-test/mysql-test-run.pl@stripped, 2006-10-31 17:16:04+01:00, msvensson@shellback.(none) +10 -8
    Remove warning, exe_mysql_fix_system_tables are not available on windows

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.135/mysql-test/mysql-test-run.pl	2006-10-31 17:16:13 +01:00
+++ 1.136/mysql-test/mysql-test-run.pl	2006-10-31 17:16:13 +01:00
@@ -1801,14 +1801,16 @@
   # ----------------------------------------------------
   # Setup env so childs can execute mysql_fix_system_tables
   # ----------------------------------------------------
-  my $cmdline_mysql_fix_system_tables=
-    "$exe_mysql_fix_system_tables --no-defaults --host=localhost " .
-    "--user=root --password= " .
-    "--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " .
-    "--port=$master->[0]->{'port'} " .
-    "--socket=$master->[0]->{'path_sock'}";
-
-  $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;
+  if ( ! $glob_win32 )
+  {
+    my $cmdline_mysql_fix_system_tables=
+      "$exe_mysql_fix_system_tables --no-defaults --host=localhost " .
+      "--user=root --password= " .
+      "--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " .
+      "--port=$master->[0]->{'port'} " .
+      "--socket=$master->[0]->{'path_sock'}";
+    $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;
+  }
 
   # ----------------------------------------------------
   # Setup env so childs can execute my_print_defaults
Thread
bk commit into 4.1 tree (msvensson:1.2611)msvensson31 Oct