diff options
author | Monty <monty@mariadb.org> | 2021-12-28 16:37:14 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2021-12-28 16:37:14 +0200 |
commit | a48d2ec866751e9da76066bf3a30f99da9031ab0 (patch) | |
tree | e8402ba0e7c3965a1c954760bf87c71e4b87a820 | |
parent | 5045509b724cbfe0311366fd2bbc36c7753e0852 (diff) | |
download | mariadb-git-a48d2ec866751e9da76066bf3a30f99da9031ab0.tar.gz |
Add --valgrind to VERSION() string for valgrind builds
Fixes main.sp-no-valgrind for valgrind builds not done with BUILD scripts
-rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index af68d28dd9f..310dcada671 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9038,10 +9038,12 @@ void set_server_version(char *buf, size_t size) { bool is_log= opt_log || global_system_variables.sql_log_slow || opt_bin_log; bool is_debug= IF_DBUG(!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"), 0); + bool is_valgrind= IF_VALGRIND(!strstr(MYSQL_SERVER_SUFFIX_STR, "-valgrind"), 0); strxnmov(buf, size - 1, MYSQL_SERVER_VERSION, MYSQL_SERVER_SUFFIX_STR, IF_EMBEDDED("-embedded", ""), + is_valgrind ? "-valgrind" : "", is_debug ? "-debug" : "", is_log ? "-log" : "", NullS); |