Commit 67da87d8 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/t/sp.test:
  Auto merged
mysys/typelib.c:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/table.cc:
  Auto merged
include/typelib.h:
  Merged from 5.1 main tree.
mysql-test/r/sp.result:
  Merged from 5.1 main tree.
parents 65e5af7b 0b4db8ad

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_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

+14 −12
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;
@@ -1104,7 +1099,7 @@ static int dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info, 
  uint logname_len;

  NET* net;

  int error= 0;

  my_off_t old_off= start_position_mot;

  my_off_t old_off= min(start_position_mot, BIN_LOG_HEADER_SIZE);

  char fname[FN_REFLEN+1];

  DBUG_ENTER("dump_remote_log_entries");
@@ -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,
@@ -1257,8 +1252,15 @@ 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.



      Exception - the server sends Format_description_log_event

      in the beginning of the dump, and only after it the event from

      start_position. Let the old_off reflect it.

    */

    if (old_off < start_position_mot)

      old_off= start_position_mot;

    else

      old_off+= len-1;

  }

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;

}