Commit 7f5c589c authored Mar 19, 2007 by unknown

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel


sql/mysqld.cc:
  Auto merged

parents 6bb42080 3615debe

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