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

Move mariadb specific client flags and server capabilities to mysql->extension

Browse Source
This commit is contained in:
Georg Richter
2016-08-16 14:58:15 +02:00
parent b92b37c746
commit 429b166cbe
7 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmariadb/mariadb_lib.c
View File

@@ -206,7 +206,7 @@ restart:
if (last_errno== 65535 &&
((mariadb_connection(mysql) && (mysql->server_capabilities & CLIENT_PROGRESS)) ||
(!(mysql->server_capabilities & CLIENT_MYSQL) && mysql->server_capabilities & MARIADB_CLIENT_PROGRESS)))
(!(mysql->extension->mariadb_server_capabilities & MARIADB_CLIENT_PROGRESS >> 32))))
{
if (cli_report_progress(mysql, (uchar *)pos, (uint) (len-1)))
{
@@ -1371,7 +1371,7 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user,
/* check if MariaD2B specific capabilities are available */
if (is_maria && !(mysql->server_capabilities & CLIENT_MYSQL))
{
mysql->server_capabilities|= (ulonglong) uint4korr(end + 14) << 32;
mysql->extension->mariadb_server_capabilities= (ulonglong) uint4korr(end + 14);
}
}