Commit 940eb733 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
parents 0e625692 d25dd073

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -60,5 +60,5 @@ enum options_client 
  OPT_SLAP_AUTO_GENERATE_SQL_LOAD_TYPE, OPT_SLAP_AUTO_GENERATE_WRITE_NUM,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,

  OPT_DEBUG_INFO, OPT_COLUMN_TYPES

  OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE

};

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
@@ -287,15 +287,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
@@ -946,14 +946,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;

}