diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 20:18:39 +0500 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 20:18:39 +0500 |
| commit | 4c55e2ac4b737db533094c460882917bfb2aadd6 (patch) | |
| tree | 80ed4dd4e49cf529da5825d7ef1f563e263305eb /sql-common | |
| parent | d7dd19aa07c3ba439c2b97d50949f2142cefb203 (diff) | |
| parent | 84648dfbdd96d1c56f5e79c3b5b3bc195567e226 (diff) | |
| download | mariadb-git-4c55e2ac4b737db533094c460882917bfb2aadd6.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
sql-common/client.c:
Auto merged
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 1941e6bc517..04d4bc06102 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1058,9 +1058,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); |