summaryrefslogtreecommitdiff
path: root/sql-common/client.c
diff options
context:
space:
mode:
Diffstat (limited to 'sql-common/client.c')
-rw-r--r--sql-common/client.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index b96231fcc13..4a4084fbc7e 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -601,7 +601,7 @@ restart:
uint last_errno=uint2korr(pos);
if (last_errno == 65535 &&
- (mysql->server_capabilities & CLIENT_PROGRESS_OBSOLETE))
+ (mysql->server_capabilities & CLIENT_PROGRESS))
{
if (cli_report_progress(mysql, pos+2, (uint) (len-3)))
{
@@ -1005,11 +1005,6 @@ enum option_id {
static TYPELIB option_types={array_elements(default_options)-1,
"options",default_options, NULL};
-const char *sql_protocol_names_lib[] =
-{ "TCP", "SOCKET", "PIPE", "MEMORY", NullS };
-TYPELIB sql_protocol_typelib = {array_elements(sql_protocol_names_lib)-1,"",
- sql_protocol_names_lib, NULL};
-
static int add_init_command(struct st_mysql_options *options, const char *cmd)
{
char *tmp;