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

client/mysql.cc

@@ -753,7 +753,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     opt_nopager= 1;
   case OPT_MYSQL_PROTOCOL:
   {
-    if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
+    if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
     {
       fprintf(stderr, "Unknown option to protocol: %s\n", argument);
       exit(1);

client/mysqladmin.c

@@ -249,7 +249,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     break;
   case OPT_MYSQL_PROTOCOL:
   {
-    if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
+    if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
     {
       fprintf(stderr, "Unknown option to protocol: %s\n", argument);
       exit(1);

client/mysqlbinlog.cc

@@ -633,7 +633,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     break;
   case OPT_MYSQL_PROTOCOL:
   {
-    if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
+    if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
     {
       fprintf(stderr, "Unknown option to protocol: %s\n", argument);
       exit(1);

client/mysqlcheck.c

@@ -271,7 +271,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   case 'V': print_version(); exit(0);
   case OPT_MYSQL_PROTOCOL:
   {
-    if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
+    if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
     {
       fprintf(stderr, "Unknown option to protocol: %s\n", argument);
       exit(1);

client/mysqldump.c

@@ -582,7 +582,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     }
   case (int) OPT_MYSQL_PROTOCOL:
     {
-      if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
+      if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
       {
 	fprintf(stderr, "Unknown option to protocol: %s\n", argument);
 	exit(1);

client/mysqlimport.c

@@ -203,7 +203,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
 #endif
   case OPT_MYSQL_PROTOCOL:
   {
-    if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
+    if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
     {
       fprintf(stderr, "Unknown option to protocol: %s\n", argument);
       exit(1);

client/mysqlshow.c

@@ -268,7 +268,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     break;
   case OPT_MYSQL_PROTOCOL:
   {
-    if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
+    if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
     {
       fprintf(stderr, "Unknown option to protocol: %s\n", argument);
       exit(1);

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);