Commit 9340cb19 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


mysql-test/r/strict.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents cc76701e 9c0097fa

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -67,5 +67,5 @@ enum options_client 
  OPT_SLAP_POST_QUERY,

  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_WRITE_BINLOG

  OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE, OPT_WRITE_BINLOG

};

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

+20 −13
Original line number Diff line number Diff line
@@ -944,14 +944,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;
@@ -1167,7 +1162,7 @@ could be out of memory"); 
    }

    if (len < 8 && net->read_pos[0] == 254)

      break; // end of data

    DBUG_PRINT("info",( "len: %lu, net->read_pos[5]: %d\n",

    DBUG_PRINT("info",( "len: %lu  net->read_pos[5]: %d\n",

			len, net->read_pos[5]));

    if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 ,

                                        len - 1, &error_msg,
@@ -1222,6 +1217,18 @@ could be out of memory"); 
          len= 1; // fake Rotate, so don't increment old_off

        }

      }

      else if (type == FORMAT_DESCRIPTION_EVENT)

      {

        /*

          This could be an fake Format_description_log_event that server

          (5.0+) automatically sends to a slave on connect, before sending

          a first event at the requested position.  If this is the case,

          don't increment old_off. Real Format_description_log_event always

          starts from BIN_LOG_HEADER_SIZE position.

        */

        if (old_off != BIN_LOG_HEADER_SIZE)

          len= 1;         // fake event, don't increment old_off

      }

      if ((error= process_event(print_event_info, ev, old_off)))

      {

	error= ((error < 0) ? 0 : 1);
@@ -1257,7 +1264,7 @@ could be out of memory"); 
    }

    /*

      Let's adjust offset for remote log as for local log to produce

      similar text.

      similar text and to have --stop-position to work identically.

    */

    old_off+= len-1;

  }

client/mysqlcheck.c

+2 −7
Original line number Diff line number Diff line
@@ -315,15 +315,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;

}