Commit 519e7256 authored Jan 27, 2001 by jcole@tetra.spaceapes.com

manual merge

parents 7c5db0d3 31569172

Docs/manual.texi

+3 −2

Original line number	Diff line number	Diff line
		@@ -40812,7 +40812,9 @@ not yet 100 % confident in this code.

		@node News-3.23.33, News-3.23.32, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.33
		@itemize bullet
		@itemize @bullet
		@item
		Changed clients to use TCP/IP when -P or --port option is specified.
		@item
		Fixed bug in replication that broke slave server start with existing
		@code{master.info}. This fixes a bug introduced in 3.23.32.
		@@ -40840,7 +40842,6 @@ Extended @code{mysqltest} to take care of the timing issues in the test
		suite.
		@end itemize


		@node News-3.23.32, News-3.23.31, News-3.23.33, News-3.23.x
		@appendixsubsec Changes in release 3.23.32
		@itemize @bullet

client/mysql.cc

+4 −0

Original line number	Diff line number	Diff line
		@@ -692,6 +692,10 @@ static int get_options(int argc, char **argv)
		skip_column_names=1;
		break;
		case 'P':
		if(!current_host) {
		my_free(current_host, MYF(MY_ALLOW_ZERO_PTR));
		current_host=my_strdup("127.0.0.1", MYF(MY_WME));
		};
		opt_mysql_port= (unsigned int) atoi(optarg);
		break;
		case 'S':

client/mysqladmin.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,10 @@ int main(int argc,char *argv[])
		interval=atoi(optarg);
		break;
		case 'P':
		if(!host) {
		my_free(host, MYF(MY_ALLOW_ZERO_PTR));
		host=my_strdup("127.0.0.1", MYF(MY_WME));
		};
		tcp_port= (unsigned int) atoi(optarg);
		break;
		case 'r':

client/mysqldump.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -344,6 +344,10 @@ static int get_options(int argc,char **argv)
		tty_password=1;
		break;
		case 'P':
		if(!current_host) {
		my_free(current_host, MYF(MY_ALLOW_ZERO_PTR));
		current_host=my_strdup("127.0.0.1", MYF(MY_WME));
		};
		opt_mysql_port= (unsigned int) atoi(optarg);
		break;
		case 'S':

client/mysqlshow.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -238,6 +238,10 @@ get_options(int argc,char **argv)
		break;
		#endif
		case 'P':
		if(!host) {
		my_free(host, MYF(MY_ALLOW_ZERO_PTR));
		host=my_strdup("127.0.0.1", MYF(MY_WME));
		};
		opt_mysql_port= (unsigned int) atoi(optarg);
		break;
		case 'S':