bzr push into mysql-5.1 branch (msvensson:2730 to 2731) WL#4189

[Magnus Svensson]

 2731 Magnus Svensson	2009-01-26
      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.
modified:
  mysql-test/include/mtr_warnings.sql
  sql/sql_test.cc

 2730 Magnus Svensson	2009-01-26
      WL#4189 mtr.pl v2
       - rewrite "check warnings" to be faster by not creating a full join
         between error_log and suspicious_patterns while running REGEXP.
         Instead add a column to error_log that will be set to 1 to indicate
         a warning and run the 6 REGEXP's we have for suspicious lines as
         6 separate full table scans.
       - Remove the "suspicious_patterns" table from mtr db
       - Use 'xykls37' as separator when loading the error log, that line should
         hopefully never exist in a line that should be a warning
modified:
  mysql-test/include/check-warnings.test
  mysql-test/include/mtr_warnings.sql
  mysql-test/r/mysql_upgrade.result
  mysql-test/r/mysqlcheck.result

=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2009-01-26 14:20:33 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2009-01-26 15:39:00 +0000
@@ -237,6 +237,17 @@ BEGIN
       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
   --
   SELECT COUNT(*) INTO @num_warnings FROM error_log

=== modified file 'sql/sql_test.cc'
--- a/sql/sql_test.cc	2008-05-09 07:43:02 +0000
+++ b/sql/sql_test.cc	2009-01-26 15:39:00 +0000
@@ -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\