diff options
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 11 | ||||
| -rw-r--r-- | sql/sql_test.cc | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index fce7977df16..c1476457ff4 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -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 diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 01363714484..78932396efe 100644 --- a/sql/sql_test.cc +++ b/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\ |