diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
| commit | 09a1f0075a8d5752dd7b2940a20d86a040af1741 (patch) | |
| tree | 42c96cf95d5df2950b77329c76c0024f33088aff /sql-common/client.c | |
| parent | e6f95b23f425001a14a528256354e0faf4e272f6 (diff) | |
| parent | 440d4b282dd4992d64abdd6289859598db7e5f75 (diff) | |
| download | mariadb-git-09a1f0075a8d5752dd7b2940a20d86a040af1741.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 42ef5e24a75..95118fa1859 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1,5 +1,5 @@ /* Copyright (c) 2003, 2016, Oracle and/or its affiliates. - Copyright (c) 2009, 2019, MariaDB + Copyright (c) 2009, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3020,7 +3020,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, /* New protocol with 16 bytes to describe server characteristics */ mysql->server_language=end[2]; mysql->server_status=uint2korr(end+3); - mysql->server_capabilities|= uint2korr(end+5) << 16; + mysql->server_capabilities|= ((unsigned) uint2korr(end+5)) << 16; pkt_scramble_len= end[7]; if (pkt_scramble_len < 0) { |