Commit 7aecbab8 authored by unknown's avatar unknown
Browse files

Merge with global tree 


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/order_by.test:
  Merge
sql/sql_lex.cc:
  Merge
sql/sql_yacc.yy:
  Use local copy
parents 25245179 985805ce

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ ram@mysql.r18.ru 
ram@ram.(none)

ranger@regul.home.lan

rburnett@build.mysql.com

reggie@bob.(none)

root@home.(none)

root@mc04.(none)

root@x3.internalnet

client/mysql.cc

+9 −1
Original line number Diff line number Diff line
@@ -3234,13 +3234,20 @@ static const char* construct_prompt() 
	break;

      }

      case 'p':

      {

#ifndef EMBEDDED_LIBRARY

	if (!connected)

	{

	  processed_prompt.append("not_connected");

	  break;

	}

	if (strstr(mysql_get_host_info(&mysql),"TCP/IP") ||



	const char *host_info = mysql_get_host_info(&mysql);

	if (strstr(host_info, "memory")) 

	{

		processed_prompt.append( mysql.host );

	}

	else if (strstr(host_info,"TCP/IP") ||

	    !mysql.unix_socket)

	  add_int_to_prompt(mysql.port);

	else
@@ -3249,6 +3256,7 @@ static const char* construct_prompt() 
 	  processed_prompt.append(pos ? pos+1 : mysql.unix_socket);

	}

#endif

      }

	break;

      case 'U':

	if (!full_username)

client/mysqldump.c

+3 −3
Original line number Diff line number Diff line
@@ -305,6 +305,9 @@ static struct my_option my_long_options[] = 
  {"opt", OPT_OPTIMIZE,

   "Same as --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys. Enabled by default, disable with --skip-opt.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"order-by-primary", OPT_ORDER_BY_PRIMARY,

   "Sorts each table's rows by primary key, or first unique key, if such a key exists.  Useful when dumping a MyISAM table to be loaded into an InnoDB table, but will make the dump itself take considerably longer.",

   (gptr*) &opt_order_by_primary, (gptr*) &opt_order_by_primary, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"password", 'p',

   "Password to use when connecting to server. If password is not given it's solicited on the tty.",

   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
@@ -356,9 +359,6 @@ static struct my_option my_long_options[] = 
  {"socket", 'S', "Socket file to use for connection.",

   (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR,

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

  {"order-by-primary", OPT_ORDER_BY_PRIMARY,

   "Sorts each table's rows by primary key, or first unique key, if such a key exists.  Useful when dumping a MyISAM table to be loaded into an InnoDB table, but will make the dump itself take considerably longer.",

   (gptr*) &opt_order_by_primary, (gptr*) &opt_order_by_primary, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#include <sslopt-longopts.h>

  {"tab",'T',

   "Creates tab separated textfile for each table to given path. (creates .sql and .txt files). NOTE: This only works if mysqldump is run on the same machine as the mysqld daemon.",

libmysql/libmysql.c

+1 −0
Original line number Diff line number Diff line
@@ -857,6 +857,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename) 
err:

  /* free up memory allocated with _init, usually */

  (*options->local_infile_end)(li_ptr);

  my_free(buf, MYF(0));

  DBUG_RETURN(result);

}

myisam/mi_open.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) 
      goto err;

    }

    /* Don't call realpath() if the name can't be a link */

    if (strcmp(name_buff, org_name)  ||

    if (!strcmp(name_buff, org_name) ||

        my_readlink(index_name, org_name, MYF(0)) == -1)

      (void) strmov(index_name, org_name);

    (void) fn_format(data_name,org_name,"",MI_NAME_DEXT,2+4+16);