Skip to content

Commit 20f22df

Browse files
committed
Fixed some tests that failes when built with valgrind
Example build: ./BUILD/compile-pentium64-valgrind-max Fixes: - sp-no-valgrind failed if binary was built for valgrind as in this case mem_root is allocated in very small hunks which the test cannot handle. Fixed by testing of valgrind build - truncate_notembedded failed in reap because of more memory used. Fixed by allowing reap to fail too
1 parent 607b14c commit 20f22df

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
if (`select version() like '%valgrind%'`)
2+
{
3+
skip Does not run with binaries built with valgrind;
4+
}

mysql-test/main/sp-no-valgrind.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
--source include/not_valgrind.inc
2+
--source include/not_valgrind_build.inc
33

44
--echo # MDEV-20699 do not cache SP in SHOW CREATE
55
--echo # Warmup round, this might allocate some memory for session variable

mysql-test/main/truncate_notembedded.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ SELECT * FROM t1;
1818
UNLOCK TABLES;
1919

2020
--connection con1
21+
--error 0,ER_OPTION_PREVENTS_STATEMENT
2122
--reap
2223
# This may work or fail as different servers uses different amount of
2324
# memory and the statement may work or not. What is important is that we

0 commit comments

Comments
 (0)