bk commit into 5.0 tree (thek:1.2489)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.0 repository of thek. When thek 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, 2007-05-24 13:53:49+02:00, thek@adventure.(none) +2 -0
  Merge adventure.(none):/home/thek/Development/cpp/bug28644/my41-bug28644
  into  adventure.(none):/home/thek/Development/cpp/bug28644/my50-bug28644
  MERGE: 1.1616.3024.13

  mysql-test/lib/mtr_report.pl@stripped, 2007-05-24 13:53:47+02:00, thek@adventure.(none) +0 -0
    Auto merged
    MERGE: 1.11.2.11

  sql/sql_test.cc@stripped, 2007-05-24 13:53:47+02:00, thek@adventure.(none) +0 -0
    Auto merged
    MERGE: 1.30.1.6

# 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:	thek
# Host:	adventure.(none)
# Root:	/home/thek/Development/cpp/bug28644/my50-bug28644/RESYNC

--- 1.48/sql/sql_test.cc	2006-12-30 21:02:07 +01:00
+++ 1.49/sql/sql_test.cc	2007-05-24 13:53:47 +02:00
@@ -503,7 +503,9 @@ Next alarm time: %lu\n",
   display_table_locks();
   fflush(stdout);
   my_checkmalloc();
+  fprintf(stdout,"\nBegin safemalloc memory dump:\n"); // tag needed for test suite
   TERMINATE(stdout);				// Write malloc information
+  fprintf(stdout,"\nEnd safemalloc memory dump.\n");  
 
 #ifdef HAVE_MALLINFO
   struct mallinfo info= mallinfo();

--- 1.38/mysql-test/lib/mtr_report.pl	2007-04-28 10:13:11 +02:00
+++ 1.39/mysql-test/lib/mtr_report.pl	2007-05-24 13:53:47 +02:00
@@ -277,8 +277,19 @@ sub mtr_report_stats ($) {
             mtr_warning("can't read $errlog");
             next;
           }
+          my $leak_reports_expected= undef;
           while ( <ERR> )
           {
+            # There is a test case that purposely provokes a
+            # SAFEMALLOC leak report, even though there is no actual
+            # leak. We need to detect this, and ignore the warning in
+            # that case.
+            if (/Begin safemalloc memory dump:/) {
+              $leak_reports_expected= 1;
+            } elsif (/End safemalloc memory dump./) {
+              $leak_reports_expected= undef;
+            }
+
             # Skip some non fatal warnings from the log files
             if ( /Warning:\s+Table:.* on (delete|rename)/ or
                  /Warning:\s+Setting lower_case_table_names=2/ or
@@ -289,6 +300,9 @@ sub mtr_report_stats ($) {
             }
             if ( /$pattern/ )
             {
+              if ($leak_reports_expected) {
+                next;
+              }
               $found_problems= 1;
               print WARN $_;
             }