database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

WL#4189 mtr.pl v2

Browse Source 
- Suppress intentional safemalloc dump warnings
 - add fflush(stdout) to make sure that the "End safemalloc memory dump." marker is flushed.
This commit is contained in:
Magnus Svensson
2009-01-26 16:39:00 +01:00
parent 2bea349bec
commit 0618b83622
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/include/mtr_warnings.sql
View File

@ -236,6 +236,17 @@ BEGIN
SET suspicious=0 SET suspicious=0
WHERE el.suspicious=1 AND el.line REGEXP ts.pattern; 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 -- Get the number of marked lines and return result
-- --

2
sql/sql_test.cc
View File

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