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 /tests | |
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 'tests')
-rw-r--r-- | tests/mysql_client_test.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index ae4cf6d71d3..91efdc9ef35 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -18699,8 +18699,11 @@ static void test_progress_reporting() myheader("test_progress_reporting"); - conn= client_connect(CLIENT_PROGRESS, MYSQL_PROTOCOL_TCP, 0); - DIE_UNLESS(conn->client_flag & CLIENT_PROGRESS); + + conn= client_connect(CLIENT_PROGRESS_OBSOLETE, MYSQL_PROTOCOL_TCP, 0); + if (!(conn->server_capabilities & CLIENT_PROGRESS_OBSOLETE)) + return; + DIE_UNLESS(conn->client_flag & CLIENT_PROGRESS_OBSOLETE); mysql_options(conn, MYSQL_PROGRESS_CALLBACK, (void*) report_progress); rc= mysql_query(conn, "set @save=@@global.progress_report_time"); |