Commit 7b2966f9 authored by unknown's avatar unknown
Browse files

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
parents ae87e658 4c55e2ac

client/mysql.cc

+1 −2
Original line number Diff line number Diff line
@@ -753,8 +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)) ==

	~(ulong) 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

+1 −1
Original line number Diff line number Diff line
@@ -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)) == ~(ulong) 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

+1 −2
Original line number Diff line number Diff line
@@ -633,8 +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)) ==

	~(ulong) 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

+1 −1
Original line number Diff line number Diff line
@@ -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)) == ~(ulong) 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

+1 −2
Original line number Diff line number Diff line
@@ -582,8 +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))

	  == ~(ulong) 0)

      if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)

      {

	fprintf(stderr, "Unknown option to protocol: %s\n", argument);

	exit(1);