bk commit into 5.0 tree (msvensson:1.2104)

[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.2104 06/03/23 20:05:09 msvensson@shellback.(none) +1 -0
  Delete gdbinit file before writing to it
  Concat type+idx to get a unique gdbinit filename

  mysql-test/mysql-test-run.pl
    1.82 06/03/23 20:05:02 msvensson@shellback.(none) +10 -4
    Delete gdbinit file before writing to it
    Concat type+idx to get a unique gdbinit filename

# 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-5.0

--- 1.81/mysql-test/mysql-test-run.pl	2006-03-23 18:58:47 +01:00
+++ 1.82/mysql-test/mysql-test-run.pl	2006-03-23 20:05:02 +01:00
@@ -2550,11 +2550,11 @@
 
   if ( $opt_gdb || $opt_manual_gdb)
   {
-    gdb_arguments(\$args, \$exe, $type);
+    gdb_arguments(\$args, \$exe, "$type"."_$idx");
   }
   elsif ( $opt_ddd || $opt_manual_ddd )
   {
-    ddd_arguments(\$args, \$exe, $type);
+    ddd_arguments(\$args, \$exe, "$type"."_$idx");
   }
   elsif ( $opt_manual_debug )
   {
@@ -3089,6 +3089,9 @@
   my $str= join(" ", @$$args);
   my $gdb_init_file= "$opt_tmpdir/gdbinit.$type";
 
+  # Remove the old gdbinit file
+  unlink($gdb_init_file);
+
   if ( $type eq "client" )
   {
     # write init file for client
@@ -3110,7 +3113,7 @@
 
   if ( $opt_manual_gdb )
   {
-     print "\nTo start gdb for$type, type in another window:\n";
+     print "\nTo start gdb for $type, type in another window:\n";
      print "cd $glob_mysql_test_dir;\n";
      print "gdb -x $gdb_init_file $$exe\n";
 
@@ -3150,6 +3153,9 @@
   my $str= join(" ", @$$args);
   my $gdb_init_file= "$opt_tmpdir/gdbinit.$type";
 
+  # Remove the old gdbinit file
+  unlink($gdb_init_file);
+
   if ( $type eq "client" )
   {
     # write init file for client
@@ -3172,7 +3178,7 @@
 
   if ( $opt_manual_ddd )
   {
-     print "\nTo start ddd for$type, type in another window:\n";
+     print "\nTo start ddd for $type, type in another window:\n";
      print "cd $glob_mysql_test_dir;\n";
      print "ddd -x $gdb_init_file $$exe\n";