1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some tests that failes when built with valgrind

Browse Source 
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
This commit is contained in:
Monty 2021-12-15 23:29:04 +02:00
parent 607b14c4dc
commit 20f22dfa2f
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/not_valgrind_build.inc Normal file
View File

@ -0,0 +1,4 @@
if (`select version() like '%valgrind%'`)
{
skip Does not run with binaries built with valgrind;
}

2
mysql-test/main/sp-no-valgrind.test
View File

@ -1,5 +1,5 @@
--source include/not_valgrind.inc --source include/not_valgrind_build.inc
--echo # MDEV-20699 do not cache SP in SHOW CREATE --echo # MDEV-20699 do not cache SP in SHOW CREATE
--echo # Warmup round, this might allocate some memory for session variable --echo # Warmup round, this might allocate some memory for session variable

1
mysql-test/main/truncate_notembedded.test
View File

@ -18,6 +18,7 @@ SELECT * FROM t1;
UNLOCK TABLES; UNLOCK TABLES;
--connection con1 --connection con1
--error 0,ER_OPTION_PREVENTS_STATEMENT
--reap --reap
# This may work or fail as different servers uses different amount of # This may work or fail as different servers uses different amount of
# memory and the statement may work or not. What is important is that we # memory and the statement may work or not. What is important is that we