diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 07:39:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 07:39:33 +0300 |
| commit | f347b3e0e6592329b1447fa460aca0a4b1f680b1 (patch) | |
| tree | c671aced17dc9f6d0cc6c5a660b73b2e2dcfe841 /libmysqld | |
| parent | b0f836053b094b09999c102d10bf0ad6ed761ac6 (diff) | |
| parent | 1df1a6392477ad211b2a66c6eccbe9d5c6316c7e (diff) | |
| download | mariadb-git-f347b3e0e6592329b1447fa460aca0a4b1f680b1.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/libmysql.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index bd5176566d6..243a451bbda 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -154,8 +154,10 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), */ #if MYSQL_PORT_DEFAULT == 0 +# if !__has_feature(memory_sanitizer) // Work around MSAN deficiency if ((serv_ptr= getservbyname("mysql", "tcp"))) mysql_port= (uint) ntohs((ushort) serv_ptr->s_port); +# endif #endif if ((env= getenv("MYSQL_TCP_PORT"))) mysql_port=(uint) atoi(env); |