Commit e324da30 authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/mysql-5.0 

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 448327af 2883e932

VC++Files/sql/mysqld.dsp

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ SOURCE=.\gstream.cpp 
# End Source File

# Begin Source File



SOURCE=.\examples\ha_archive.cpp

SOURCE=.\ha_archive.cpp

# End Source File

# Begin Source File

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

+7 −6
Original line number Diff line number Diff line
@@ -330,7 +330,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},
@@ -2152,6 +2152,8 @@ static void dump_table(char *table, char *db) 
      for (i = 0; i < mysql_num_fields(res); i++)

      {

        int is_blob;

        ulong length= lengths[i];



	if (!(field = mysql_fetch_field(res)))

	{

	  my_snprintf(query, QUERY_LENGTH,
@@ -2178,7 +2180,6 @@ static void dump_table(char *table, char *db) 
                   field->type == MYSQL_TYPE_TINY_BLOB)) ? 1 : 0;

	if (extended_insert)

	{

	  ulong length = lengths[i];

	  if (i == 0)

	    dynstr_set(&extended_row,"(");

	  else
@@ -2268,19 +2269,19 @@ static void dump_table(char *table, char *db) 
	      {

	        print_xml_tag1(md_result_file, "\t\t", "field name=",

			      field->name, "");

		print_quoted_xml(md_result_file, row[i], lengths[i]);

		print_quoted_xml(md_result_file, row[i], length);

		fputs("</field>\n", md_result_file);

	      }

	      else if (opt_hex_blob && is_blob)

	      else if (opt_hex_blob && is_blob && length)

              {

                /* sakaik got the idea to to provide blob's in hex notation. */

                char *ptr= row[i], *end= ptr+ lengths[i];

                char *ptr= row[i], *end= ptr + length;

                fputs("0x", md_result_file);

                for (; ptr < end ; ptr++)

		  fprintf(md_result_file, "%02X", *((uchar *)ptr));

              }

              else

                unescape(md_result_file, row[i], lengths[i]);

                unescape(md_result_file, row[i], length);

	    }

	    else

	    {