diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-25 09:36:30 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-25 09:36:30 +0300 |
| commit | 232af0c7bfe0ad7a9a4b199ffca59a3e2acbf48e (patch) | |
| tree | 56748d9384a348cda1db4de3527320e4fa623b6f | |
| parent | c009ce7dd085b55b27cc6d9d4bfe3519f88e477f (diff) | |
| download | mariadb-git-232af0c7bfe0ad7a9a4b199ffca59a3e2acbf48e.tar.gz | |
Do not disable --symbolic-links on Valgrind (or MSAN)
The option --symbolic-links was originally disabled by default under
Purify (and later Valgrind) in 51156c5af2a8a3a978085a7c54de0ad55f73775c
without any explanation.
| -rw-r--r-- | mysql-test/main/symlink-myisam-11902.test | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/main/symlink-myisam-11902.test b/mysql-test/main/symlink-myisam-11902.test index 8fae41222cf..c782ef44ec5 100644 --- a/mysql-test/main/symlink-myisam-11902.test +++ b/mysql-test/main/symlink-myisam-11902.test @@ -56,5 +56,8 @@ flush tables; drop table if exists t1; exec rm -r $MYSQLTEST_VARDIR/tmp/foo; +# Under Valgrind, this could display a warning ER_FILE_NOT_FOUND +--disable_warnings drop table mysql.t1; +--enable_warnings set debug_sync='RESET'; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6a53ee888f0..a3b417c8d07 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6729,7 +6729,7 @@ struct my_option my_long_options[]= Also disable by default on Windows, due to high overhead for checking .sym files. */ - IF_VALGRIND(0,IF_WIN(0,1)), 0, 0, 0, 0, 0}, + IF_WIN(0,1), 0, 0, 0, 0, 0}, {"sysdate-is-now", 0, "Non-default option to alias SYSDATE() to NOW() to make it safe-replicable. " "Since 5.0, SYSDATE() returns a `dynamic' value different for different " |