diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 20:13:31 +0500 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 20:13:31 +0500 |
| commit | 84648dfbdd96d1c56f5e79c3b5b3bc195567e226 (patch) | |
| tree | 82f89fe2bd46076041d452986fa0f42c286e8211 /sql-common | |
| parent | aab7b774d58098f1397dd499c898d1221b3b50fc (diff) | |
| download | mariadb-git-84648dfbdd96d1c56f5e79c3b5b3bc195567e226.tar.gz | |
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
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 5 |
1 files changed, 2 insertions, 3 deletions
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); |