database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-9117: Client Server capability negotiation for MariaDB specific functionality

Browse Source 
New capability flags space.
Removed old progress flag, added new one.
This commit is contained in:
Oleksandr Byelkin
2016-01-17 21:21:39 +01:00
parent 36eccebd6f
commit d4b3a199ac
10 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysql.cc
View File

@@ -1921,7 +1921,7 @@ static int get_options(int argc, char **argv)
connect_flag|= CLIENT_IGNORE_SPACE;
if (opt_progress_reports)
connect_flag|= CLIENT_PROGRESS;
connect_flag|= CLIENT_PROGRESS_OBSOLETE;
return(0);
}
@@ -4638,10 +4638,10 @@ sql_real_connect(char *host,char *database,char *user,char *password,
mysql.reconnect= debug_info_flag; // We want to know if this happens
/*
CLIENT_PROGRESS is set only if we requsted it in mysql_real_connect()
and the server also supports it
CLIENT_PROGRESS_OBSOLETE is set only if we requested it in
mysql_real_connect() and the server also supports it
*/
if (mysql.client_flag & CLIENT_PROGRESS)
if (mysql.client_flag & CLIENT_PROGRESS_OBSOLETE)
mysql_options(&mysql, MYSQL_PROGRESS_CALLBACK, (void*) report_progress);
#else
mysql.reconnect= 1;