diff options
author | Daniel Black <daniel@mariadb.org> | 2022-03-25 11:31:49 +1100 |
---|---|---|
committer | Daniel Black <daniel@mariadb.org> | 2022-03-25 11:31:49 +1100 |
commit | ec62f46a612b52aa75d61b971d0a7eb781cc19c1 (patch) | |
tree | 81060b4bf9496fac23857060100089535ba83b27 /sql/sys_vars.cc | |
parent | 0da5f45a50b5a3bba9fcb9959af04d8229c94188 (diff) | |
parent | 157a838b1951d5767794ddfa211684ad9108a59d (diff) | |
download | mariadb-git-ec62f46a612b52aa75d61b971d0a7eb781cc19c1.tar.gz |
Merge 10.5 to 10.6
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 6869cec75d6..114714acfe6 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -5116,7 +5116,7 @@ static Sys_var_have Sys_have_symlink( # ifdef __SANITIZE_ADDRESS__ # ifdef WITH_UBSAN -# define SANITIZER_MODE "ASAN+UBSAN" +# define SANITIZER_MODE "ASAN,UBSAN" # else # define SANITIZER_MODE "ASAN" # endif |