From 84648dfbdd96d1c56f5e79c3b5b3bc195567e226 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 24 Aug 2004 20:13:31 +0500 Subject: more accurate processing of find_type result (Bug #4998 --protocol doesn't reject bad values) client/mysql.cc: more accurate processing of find_type result client/mysqladmin.c: more accurate processing of find_type result client/mysqlbinlog.cc: more accurate processing of find_type result client/mysqlcheck.c: more accurate processing of find_type result client/mysqldump.c: more accurate processing of find_type result client/mysqlimport.c: more accurate processing of find_type result client/mysqlshow.c: more accurate processing of find_type result sql-common/client.c: more accurate processing of find_type result --- sql-common/client.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sql-common/client.c') diff --git a/sql-common/client.c b/sql-common/client.c index 68878df50e8..43377bb09b1 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1057,9 +1057,8 @@ void mysql_read_default_options(struct st_mysql_options *options, options->max_allowed_packet= atoi(opt_arg); break; case 28: /* protocol */ - if ((options->protocol = find_type(opt_arg, - &sql_protocol_typelib,0)) - == ~(ulong) 0) + if ((options->protocol= find_type(opt_arg, + &sql_protocol_typelib,0)) <= 0) { fprintf(stderr, "Unknown option to protocol: %s\n", opt_arg); exit(1); -- cgit v1.2.1