diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-03 07:23:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-03 07:23:49 +0200 |
| commit | c9db50b585566b39d04218f4e0b746e0d1394dfb (patch) | |
| tree | e6158d201d97d906ce20fb1af0504a50068ff8e7 /sql/mysqld.cc | |
| parent | 1df05a0854bcde53fb8f73f9348ab54330e812e4 (diff) | |
| parent | a48d2ec866751e9da76066bf3a30f99da9031ab0 (diff) | |
| download | mariadb-git-c9db50b585566b39d04218f4e0b746e0d1394dfb.tar.gz | |
Merge 10.4 into 10.5bb-10.5-marko
Diffstat (limited to 'sql/mysqld.cc')
| -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 80aa87a5410..243e260a4c5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8701,10 +8701,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); |