Commit 3615debe authored Mar 19, 2007 by unknown

Added find_type_or_exit and find_bit_type_or_exit as wrappers

around the original functions. These will ensure that error
message is always in unique form, reduce code and print the
right alternatives automatically in an error case.


client/mysql.cc:
  Changed find_type to find_type_or_exit
client/mysqladmin.cc:
  Changed find_type to find_type_or_exit
client/mysqlbinlog.cc:
  Changed find_type to find_type_or_exit
client/mysqlcheck.c:
  Changed find_type to find_type_or_exit
client/mysqldump.c:
  Changed find_type to find_type_or_exit
client/mysqlimport.c:
  Changed find_type to find_type_or_exit
client/mysqlshow.c:
  Changed find_type to find_type_or_exit
client/mysqlslap.c:
  Changed find_type to find_type_or_exit
include/typelib.h:
  Added find_type_or_exit
mysql-test/r/mysql_protocols.result:
  Fixed result.
mysys/typelib.c:
  Added find_type_or_exit
sql/mysqld.cc:
  Added use of find_type_or_exit and find_bit_type_or_exit
  Fixed a missing break; from an option handling. (Bug
  in --tc-heuristic-recover)

parent 8deff6b0

client/mysql.cc

+2 −7

Original line number	Diff line number	Diff line
		@@ -885,14 +885,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		opt_nopager= 1;
		break;
		case OPT_MYSQL_PROTOCOL:
		{
		if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
		{
		fprintf(stderr, "Unknown option to protocol: %s\n", argument);
		exit(1);
		}
		opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
		opt->name);
		break;
		}
		break;
		case 'A':
		opt_rehash= 0;

client/mysqladmin.cc

+2 −7

Original line number	Diff line number	Diff line
		@@ -284,15 +284,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		#endif
		break;
		case OPT_MYSQL_PROTOCOL:
		{
		if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
		{
		fprintf(stderr, "Unknown option to protocol: %s\n", argument);
		exit(1);
		}
		opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
		opt->name);
		break;
		}
		}
		if (error)
		{
		usage();

client/mysqlbinlog.cc

+2 −7

Original line number	Diff line number	Diff line
		@@ -948,14 +948,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		remote_opt= 1;
		break;
		case OPT_MYSQL_PROTOCOL:
		{
		if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
		{
		fprintf(stderr, "Unknown option to protocol: %s\n", argument);
		exit(1);
		}
		opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
		opt->name);
		break;
		}
		case OPT_START_DATETIME:
		start_datetime= convert_str_to_timestamp(start_datetime_str);
		break;

client/mysqlcheck.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -310,15 +310,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		break;
		case 'V': print_version(); exit(0);
		case OPT_MYSQL_PROTOCOL:
		{
		if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
		{
		fprintf(stderr, "Unknown option to protocol: %s\n", argument);
		exit(1);
		}
		opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
		opt->name);
		break;
		}
		}
		return 0;
		}

client/mysqldump.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -790,15 +790,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		break;
		}
		case (int) OPT_MYSQL_PROTOCOL:
		{
		if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
		{
		fprintf(stderr, "Unknown option to protocol: %s\n", argument);
		exit(1);
		}
		opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
		opt->name);
		break;
		}
		}
		return 0;
		}