MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:November 3 2006 11:32am
Subject:bk commit into 5.0 tree (msvensson:1.2286)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 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-11-03 12:32:05+01:00, msvensson@neptunus.(none) +2 -0
  Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well.

  mysql-test/lib/mtr_misc.pl@stripped, 2006-11-03 12:32:02+01:00, msvensson@neptunus.(none) +21 -20
    Update comments

  mysql-test/mysql-test-run.pl@stripped, 2006-11-03 12:32:02+01:00, msvensson@neptunus.(none) +2 -1
    Also need to look in "$glob_basedir/bin"

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

--- 1.17/mysql-test/lib/mtr_misc.pl	2006-11-03 12:32:15 +01:00
+++ 1.18/mysql-test/lib/mtr_misc.pl	2006-11-03 12:32:15 +01:00
@@ -66,9 +66,10 @@ sub mtr_add_arg ($$@) {
 
 ##############################################################################
 
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
-
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_path_exists (@) {
   foreach my $path ( @_ )
   {
@@ -84,9 +85,11 @@ sub mtr_path_exists (@) {
   }
 }
 
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
 
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_script_exists (@) {
   foreach my $path ( @_ )
   {
@@ -109,17 +112,11 @@ sub mtr_script_exists (@) {
   }
 }
 
-sub mtr_file_exists (@) {
-  foreach my $path ( @_ )
-  {
-    return $path if -e $path;
-  }
-  return "";
-}
-
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
 
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_file_exists (@) {
   foreach my $path ( @_ )
   {
@@ -128,9 +125,11 @@ sub mtr_file_exists (@) {
   return "";
 }
 
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
 
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_exe_maybe_exists (@) {
   my @path= @_;
 
@@ -149,9 +148,11 @@ sub mtr_exe_maybe_exists (@) {
   return "";
 }
 
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
 
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_exe_exists (@) {
   my @path= @_;
   if (my $path= mtr_exe_maybe_exists(@path))
@@ -174,7 +175,7 @@ sub mtr_copy_dir($$) {
   my $from_dir= shift;
   my $to_dir= shift;
 
-#  mtr_verbose("Copying from $from_dir to $to_dir");
+  # mtr_verbose("Copying from $from_dir to $to_dir");
 
   mkpath("$to_dir");
   opendir(DIR, "$from_dir")

--- 1.141/mysql-test/mysql-test-run.pl	2006-11-03 12:32:15 +01:00
+++ 1.142/mysql-test/mysql-test-run.pl	2006-11-03 12:32:15 +01:00
@@ -670,7 +670,8 @@ sub command_line_setup () {
   $path_client_bindir= mtr_path_exists(vs_config_dirs('client', ''),
 				       "$glob_basedir/client_release",
 				       "$glob_basedir/client_debug",
-				       "$glob_basedir/client");
+				       "$glob_basedir/client",
+				       "$glob_basedir/bin");
 
   $exe_mysqld=         mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),
 				       "$glob_basedir/sql/mysqld",
Thread
bk commit into 5.0 tree (msvensson:1.2286)msvensson3 Nov