bk commit into 5.0 tree (msvensson:1.2107)

[msvensson]

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
  1.2107 06/05/02 14:46:18 msvensson@neptunus.(none) +1 -0
  Use libtool --mode=execute when starting the mysqld as well.
  Add $exe_libtool to be used throughout the script

  mysql-test/mysql-test-run.pl
    1.93 06/05/02 14:46:13 msvensson@neptunus.(none) +16 -3
    Use libtool --mode=execute when starting the mysqld as well.
    Add $exe_libtool to be used throughout the script

# 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/tmp/mysql-5.0-maint

--- 1.92/mysql-test/mysql-test-run.pl	2006-04-28 00:33:36 +02:00
+++ 1.93/mysql-test/mysql-test-run.pl	2006-05-02 14:46:13 +02:00
@@ -189,6 +189,7 @@
 our $exe_im;
 our $exe_my_print_defaults;
 our $lib_udf_example;
+our $exe_libtool;
 
 our $opt_bench= 0;
 our $opt_small_bench= 0;
@@ -448,6 +449,7 @@
   {
     $glob_use_libtool= 0;
   }
+  $exe_libtool= "../libtool";
 
   # We require that we are in the "mysql-test" directory
   # to run mysql-test-run
@@ -2624,6 +2626,15 @@
     $exe= undef;
   }
 
+  if ($glob_use_libtool and $opt_valgrind)
+  {
+    # Add "libtool --mode-execute"
+    # if running in valgrind(to avoid valgrinding bash)
+    unshift(@$args, "--mode=execute", $exe);
+    $exe= $exe_libtool;
+  }
+
+
   if ( $type eq 'master' )
   {
     if ( ! defined $exe or
@@ -3126,7 +3137,7 @@
     # Add "libtool --mode-execute" before the test to execute
     # if running in valgrind(to avoid valgrinding bash)
     unshift(@$args, "--mode=execute", $exe);
-    $exe= "libtool";
+    $exe= $exe_libtool;
   }
 
   if ( $opt_check_testcases )
@@ -3198,7 +3209,7 @@
 
   if ( $glob_use_libtool )
   {
-    mtr_add_arg($$args, "libtool");
+    mtr_add_arg($$args, $exe_libtool);
     mtr_add_arg($$args, "--mode=execute");
   }
 
@@ -3261,7 +3272,7 @@
   $$args= [];
   if ( $glob_use_libtool )
   {
-    $$exe= "libtool";
+    $$exe= $exe_libtool;
     mtr_add_arg($$args, "--mode=execute");
     mtr_add_arg($$args, "ddd");
   }
@@ -3282,6 +3293,8 @@
   my $exe=  shift;
   my $debugger= $opt_debugger || $opt_client_debugger;
 
+  # FIXME Need to change the below "eq"'s to
+  # "case unsensitive string contains"
   if ( $debugger eq "vcexpress" or $debugger eq "vc")
   {
     # vc[express] /debugexe exe arg1 .. argn