diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-22 12:23:39 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-22 12:23:39 +0200 |
| commit | 985d2d393c285ecd4539cb579b680f7b91fdaa1a (patch) | |
| tree | 8cabf6c09758c30df04de96ca98c7827d5665493 /libmysqld | |
| parent | a76a2522ec4f8c069827e038997387a8b8eb3a3a (diff) | |
| parent | 461cf3e5a3c2d346d75b1407b285f8daf9d01f67 (diff) | |
| download | mariadb-git-985d2d393c285ecd4539cb579b680f7b91fdaa1a.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/libmysqld.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index d1771a09578..e5b6f6b8397 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -121,6 +121,9 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, my_free(mysql->options.my_cnf_file); my_free(mysql->options.my_cnf_group); mysql->options.my_cnf_file=mysql->options.my_cnf_group=0; + + if (mysql->options.protocol == UINT_MAX32) + goto error; } if (!db || !db[0]) |