bk commit into 4.1 tree (knielsen:1.2553)

[knielsen]

Below is the list of changes that have just been committed into a local
4.1 repository of knielsen. When knielsen 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-24 11:33:12+01:00, knielsen@ymer.(none) +2 -0
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind (broken libc6-dbg).
  Installing libc6-dbg on Debian will still provide proper bactraces, even
  without setting LD_LIBRARY_PATH explicitly.

  mysql-test/lib/mtr_io.pl@stripped, 2006-11-24 11:33:11+01:00, knielsen@ymer.(none) +14 -0
    Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
    traces in Valgrind.

  mysql-test/mysql-test-run.pl@stripped, 2006-11-24 11:33:11+01:00, knielsen@ymer.(none) +9
-1
    Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
    traces in Valgrind.

# 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:	knielsen
# Host:	ymer.(none)
# Root:	/usr/local/mysql/mysql-4.1

--- 1.6/mysql-test/lib/mtr_io.pl	2006-11-24 11:33:16 +01:00
+++ 1.7/mysql-test/lib/mtr_io.pl	2006-11-24 11:33:16 +01:00
@@ -13,6 +13,8 @@ sub mtr_tofile ($@);
 sub mtr_tonewfile($@);
 sub mtr_lastlinefromfile($);
 sub mtr_appendfile_to_file ($$);
+sub mtr_grab_file($);
+
 
 ##############################################################################
 #
@@ -128,6 +130,7 @@ sub unspace {
   return "$quote$string$quote";
 }
 
+# Read a whole file, stripping leading and trailing whitespace.
 sub mtr_fromfile ($) {
   my $file=  shift;
 
@@ -179,6 +182,17 @@ sub mtr_appendfile_to_file ($$) {
   print TOFILE while (<FROMFILE>);
   close FROMFILE;
   close TOFILE;
+}
+
+# Read a whole file verbatim.
+sub mtr_grab_file($) {
+  my $file= shift;
+  open(FILE, '<', $file)
+    or return undef;
+  local $/= undef;
+  my $data= scalar(<FILE>);
+  close FILE;
+  return $data;
 }
 
 

--- 1.139/mysql-test/mysql-test-run.pl	2006-11-24 11:33:16 +01:00
+++ 1.140/mysql-test/mysql-test-run.pl	2006-11-24 11:33:16 +01:00
@@ -1620,9 +1620,17 @@ sub environment_setup () {
   # impossible to add correct supressions, that means if "/usr/lib/debug"
   # is available, it should be added to
   # LD_LIBRARY_PATH
+  #
+  # But pthread is broken in libc6-dbg on Debian <= 3.1 (see Debian
+  # bug 399035, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=399035),
+  # so don't change LD_LIBRARY_PATH on that platform.
   # --------------------------------------------------------------------------
   my $debug_libraries_path= "/usr/lib/debug";
-  if (  $opt_valgrind and -d $debug_libraries_path )
+  my $deb_version;
+  if (  $opt_valgrind and -d $debug_libraries_path and
+        (! -e '/etc/debian_version' or
+         ($deb_version= mtr_grab_file('/etc/debian_version')) == 0 or
+         $deb_version > 3.1 ) )
   {
     push(@ld_library_paths, $debug_libraries_path);
   }