diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:17:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:17:51 +0300 |
| commit | 1df1a6392477ad211b2a66c6eccbe9d5c6316c7e (patch) | |
| tree | 7f38ad7d6e69ea53fb9c887ff9aaa953f103ea54 /libmysqld | |
| parent | 6d3747a294d75ab8153f82c5b2d61c3bf17b04de (diff) | |
| parent | dba7e1e8e14254c9de61e74b7e68cdbbad0038a8 (diff) | |
| download | mariadb-git-1df1a6392477ad211b2a66c6eccbe9d5c6316c7e.tar.gz | |
Merge 10.2 into 10.3
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 cb81c05f663..8c80e1a3f54 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); |