diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-01-17 21:21:39 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-02-02 14:35:10 +0100 |
| commit | d4b3a199acb0ddcdedff441ae664b0a2cf2fe8d2 (patch) | |
| tree | ab3df233d02318aece37de6f0f9c42e28bccef53 /client/mysql.cc | |
| parent | 36eccebd6f8116bd8940c03701c453db71aecb69 (diff) | |
| download | mariadb-git-d4b3a199acb0ddcdedff441ae664b0a2cf2fe8d2.tar.gz | |
MDEV-9117: Client Server capability negotiation for MariaDB specific functionality
New capability flags space.
Removed old progress flag, added new one.
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 3e08c87aea1..c4dbe21a465 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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; |