diff options
| author | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
| commit | fbab79c9b8a58b90292e900cf46ab6d6632ebb68 (patch) | |
| tree | 49738ad2561489954fa0973d82be10fafbf42e0b /libmysqld | |
| parent | afbb72b3b6988f4c5242d46588754517724b2950 (diff) | |
| parent | aed2050e40cb332d54e8d40eb7242309b962c4e1 (diff) | |
| download | mariadb-git-fbab79c9b8a58b90292e900cf46ab6d6632ebb68.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
cmake/make_dist.cmake.in
mysql-test/r/func_json.result
mysql-test/r/ps.result
mysql-test/t/func_json.test
mysql-test/t/ps.test
sql/item_cmpfunc.h
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]) |