diff options
| author | Magnus Svensson <msvensson@mysql.com> | 2009-01-26 16:39:00 +0100 |
|---|---|---|
| committer | Magnus Svensson <msvensson@mysql.com> | 2009-01-26 16:39:00 +0100 |
| commit | 2cc7e72aaa813cfe368fab27846d1b7801082561 (patch) | |
| tree | e757db0544dc338de22d8ec46036abefdcb3746c /mysql-test/include | |
| parent | ee156bf0c58a973df1ea05bdb6ad0748d31c43b4 (diff) | |
| download | mariadb-git-2cc7e72aaa813cfe368fab27846d1b7801082561.tar.gz | |
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.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 11 |
1 files changed, 11 insertions, 0 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 |