Commit f967d43c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-5.0 

into  mysql.com:/usr/home/bar/mysql-5.1-new


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents c6cf4bee 5b6a28d1

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static struct my_option my_long_options[] = 
   NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"port", 'P', "Port number to use for connection.", (gptr*) &tcp_port,

   (gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0, 0},

   (gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).",

    0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"relative", 'r',

client/mysqlbinlog.cc

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static const char* database= 0; 
static my_bool force_opt= 0, short_form= 0, remote_opt= 0;

static ulonglong offset = 0;

static const char* host = 0;

static int port = MYSQL_PORT;

static int port= 0;

static const char* sock= 0;

static const char* user = 0;

static char* pass = 0;
@@ -688,7 +688,7 @@ static struct my_option my_long_options[] = 
  {"password", 'p', "Password to connect to remote server.",

   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"port", 'P', "Use port to connect to the remote server.",

   (gptr*) &port, (gptr*) &port, 0, GET_INT, REQUIRED_ARG, MYSQL_PORT, 0, 0,

   (gptr*) &port, (gptr*) &port, 0, GET_INT, REQUIRED_ARG, 0, 0, 0,

   0, 0, 0},

  {"position", 'j', "Deprecated. Use --start-position instead.",

   (gptr*) &start_position, (gptr*) &start_position, 0, GET_ULL,

client/mysqlcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static struct my_option my_long_options[] = 
   NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,

   0},

  {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).",

   0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static struct my_option my_long_options[] = 
   NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,

   0},

  {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).",

   0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

client/mysqlimport.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static struct my_option my_long_options[] = 
   NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,

   0},

  {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},