database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Merge remote-tracking branch 'origin/MDEV-12471'

Browse Source
This commit is contained in:
Georg Richter
2017-06-14 11:12:59 +02:00
parent 06d2490371 e50571e3ab
commit 1ea7be32f5
9 changed files with 348 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmariadb/mariadb_lib.c
View File

@@ -207,7 +207,7 @@ restart:
if (last_errno== 65535 &&
((mariadb_connection(mysql) && (mysql->server_capabilities & CLIENT_PROGRESS)) ||
(!(mysql->extension->mariadb_server_capabilities & MARIADB_CLIENT_PROGRESS >> 32))))
(!(mysql->extension->mariadb_server_capabilities & MARIADB_CLIENT_PROGRESS << 32))))
{
if (cli_report_progress(mysql, (uchar *)pos, (uint) (len-1)))
{
@@ -1496,7 +1496,8 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user,
net->compress= 1;
/* last part: select default db */
if (db && !mysql->db)
if (!(mysql->server_capabilities & CLIENT_CONNECT_WITH_DB) &&
(db && !mysql->db))
{
if (mysql_select_db(mysql, db))
{