WL#4189 mtr.pl v2

- Suppress intentional safemalloc dump warnings
 - add fflush(stdout) to make sure that the "End safemalloc memory dump." marker is flushed.

mysql-test/include/mtr_warnings.sql

@@ -236,6 +236,17 @@ BEGIN
     SET suspicious=0
       WHERE el.suspicious=1 AND el.line REGEXP ts.pattern;
 
+  --
+  -- Suppress intentional safemalloc dump warnings
+  -- i.e inside "Begin/End safemalloc memeory dump" block
+  --
+  SELECT @min_row:=row
+    FROM error_log WHERE line = "Begin safemalloc memory dump:";
+  SELECT @max_row:=row
+    FROM error_log WHERE line = "End safemalloc memory dump.";
+  UPDATE error_log SET suspicious=0
+    WHERE suspicious=1 AND row > @min_row AND row < @max_row;
+
   --
   -- Get the number of marked lines and return result
   --

sql/sql_test.cc

@@ -513,7 +513,7 @@ Next alarm time: %lu\n",
   fprintf(stdout,"\nBegin safemalloc memory dump:\n"); // tag needed for test suite
   TERMINATE(stdout, 1);				// Write malloc information
   fprintf(stdout,"\nEnd safemalloc memory dump.\n");  
-
+  fflush(stdout);
 #ifdef HAVE_MALLINFO
   struct mallinfo info= mallinfo();
   printf("\nMemory status:\n\