merge (c40b1073) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+2 −1

Original line number	Diff line number	Diff line
		jcole@tetra.spaceapes.com
		monty@donna.mysql.com
		monty@work.mysql.com
		mwagner@work.mysql.com
		paul@central.snake.net
		sasha@mysql.sashanet.com
		sasha@work.mysql.com
		serg@donna.mysql.com
		serg@serg.mysql.com
		tim@cane.mysql.fi
		monty@work.mysql.com

Docs/manual.texi

+111 −64

Original line number	Diff line number	Diff line
		@@ -7602,8 +7602,15 @@ To compile on NetBSD you need GNU @code{make}. Otherwise the compile will crash
		when @code{make} tries to run @code{lint} on C++ files.

		@node OpenBSD, BSDI, NetBSD, Source install system issues
		@subsection OpenBSD 2.5 Notes
		@subsection OpenBSD Notes

		@menu
		* OpenBSD 2.5:: OpenBSD 2.5 Notes
		* OpenBSD 2.8:: OpenBSD 2.8 Notes
		@end menu

		@node OpenBSD 2.5
		@subsubsection OpenBSD 2.5 Notes
		On OpenBSD Version 2.5, you can compile @strong{MySQL} with native threads
		with the following options:

		@@ -7611,6 +7618,14 @@ with the following options:
		CFLAGS=-pthread CXXFLAGS=-pthread ./configure --with-mit-threads=no
		@end example

		@node OpenBSD 2.8
		@subsubsection OpenBSD 2.8 Notes
		Our users have reported that OpenBSD 2.8 has a threading bug which causes
		problems with MySQL. The OpenBSD Developers have fixed the problem, but as
		of January 25th, 2001, it's only available in the ``-current'' branch. The
		symptoms of this threading bug are: slow response, high load, high cpu usage,
		and crashes.

		@node BSDI, SCO, OpenBSD, Source install system issues
		@subsection BSD/OS Notes

		@@ -20312,59 +20327,64 @@ The following columns are returned:
		below, though the format and numbers probably differ:

		@example
		+--------------------------+------------+
		+--------------------------+--------+
		\| Variable_name \| Value \|
		+--------------------------+------------+
		+--------------------------+--------+
		\| Aborted_clients \| 0 \|
		\| Aborted_connects \| 0 \|
		\| Bytes_received \| 142160923 \|
		\| Bytes_sent \| 1161910370 \|
		\| Connections \| 30022 \|
		\| Bytes_received \| 629539 \|
		\| Bytes_sent \| 736394 \|
		\| Connections \| 62 \|
		\| Created_tmp_disk_tables \| 0 \|
		\| Created_tmp_tables \| 8988 \|
		\| Created_tmp_tables \| 0 \|
		\| Created_tmp_files \| 0 \|
		\| Delayed_insert_threads \| 0 \|
		\| Delayed_writes \| 0 \|
		\| Delayed_errors \| 0 \|
		\| Flush_commands \| 1 \|
		\| Handler_delete \| 462604 \|
		\| Handler_read_first \| 95882 \|
		\| Handler_read_key \| 27681068 \|
		\| Handler_read_next \| 265008218 \|
		\| Handler_read_prev \| 3022500 \|
		\| Handler_read_rnd \| 36900998 \|
		\| Handler_read_rnd_next \| 252097176 \|
		\| Handler_update \| 16945404 \|
		\| Handler_write \| 66826676 \|
		\| Key_blocks_used \| 14955 \|
		\| Key_read_requests \| 90131960 \|
		\| Key_reads \| 163268 \|
		\| Key_write_requests \| 7573912 \|
		\| Key_writes \| 3780151 \|
		\| Max_used_connections \| 0 \|
		\| Handler_delete \| 0 \|
		\| Handler_read_first \| 1 \|
		\| Handler_read_key \| 9201 \|
		\| Handler_read_next \| 0 \|
		\| Handler_read_prev \| 0 \|
		\| Handler_read_rnd \| 0 \|
		\| Handler_read_rnd_next \| 45 \|
		\| Handler_update \| 5998 \|
		\| Handler_write \| 0 \|
		\| Key_blocks_used \| 407 \|
		\| Key_read_requests \| 27683 \|
		\| Key_reads \| 407 \|
		\| Key_write_requests \| 0 \|
		\| Key_writes \| 0 \|
		\| Max_used_connections \| 60 \|
		\| Not_flushed_key_blocks \| 0 \|
		\| Not_flushed_delayed_rows \| 0 \|
		\| Open_tables \| 0 \|
		\| Open_files \| 0 \|
		\| Open_tables \| 60 \|
		\| Open_files \| 66 \|
		\| Open_streams \| 0 \|
		\| Opened_tables \| 44598 \|
		\| Questions \| 1866024 \|
		\| Opened_tables \| 66 \|
		\| Questions \| 9308 \|
		\| Select_full_join \| 0 \|
		\| Select_full_range_join \| 0 \|
		\| Select_range \| 68187 \|
		\| Select_range \| 0 \|
		\| Select_range_check \| 0 \|
		\| Select_scan \| 31440 \|
		\| Select_scan \| 0 \|
		\| Slave_running \| OFF \|
		\| Slave_open_temp_tables \| 0 \|
		\| Slow_launch_threads \| 0 \|
		\| Slow_queries \| 0 \|
		\| Sort_merge_passes \| 0 \|
		\| Sort_range \| 0 \|
		\| Sort_rows \| 36650500 \|
		\| Sort_scan \| 5298 \|
		\| Threads_cached \| 0 \|
		\| Threads_connected \| 1 \|
		\| Threads_created \| 30022 \|
		\| Threads_running \| 1 \|
		\| Uptime \| 39613 \|
		+--------------------------+------------+
		\| Sort_rows \| 0 \|
		\| Sort_scan \| 0 \|
		\| Table_locks_immediate \| 3183 \|
		\| Table_locks_waited \| 6030 \|
		\| Threads_cached \| 30 \|
		\| Threads_created \| 61 \|
		\| Threads_connected \| 31 \|
		\| Threads_running \| 31 \|
		\| Uptime \| 135 \|
		+--------------------------+--------+
		@end example

		@cindex variables, status
		@@ -20427,6 +20447,12 @@ open by the slave thread
		@item @code{Sort_range} @tab Number of sorts that where done with ranges.
		@item @code{Sort_rows} @tab Number of sorted rows.
		@item @code{Sort_scan} @tab Number of sorts that where done by scanning the table.
		@item @code{Table_locks_immediate} @tab Number of times a table lock was
		acquired immediately. Available after 3.23.33.
		@item @code{Table_locks_waited} @tab Number of times a table lock could not
		be acquired immediately and a wait was needed. If this is high, and you
		have performance problems, you should first optimize your queries, and then
		either split your table(s) or use replication. Available after 3.23.33.
		@item @code{Threads_cached} @tab Number of threads in the thread cache.
		@item @code{Threads_connected} @tab Number of currently open connections.
		@item @code{Threads_created} @tab Number of threads created to handle connections.
		@@ -39012,7 +39038,7 @@ your @code{FULLTEXT} indexes.
		@end example
		line in @code{myisam/ftdefs.h} to
		@example
		#define GWS_IN_USE GWS_IDF
		#define GWS_IN_USE GWS_FREQ
		@end example
		and recompile @strong{MySQL}.
		There is no need to rebuild the indexes though.
		@@ -40915,14 +40941,24 @@ Fixed bug when using @code{DISTINCT} on results from functions that refered to
		a group function, like
		@code{SELECT a,DISTINCT SEC_TO_TIME(sum(a)) from table_name GROUP BY a,b}.
		@item
		Changed clients to use TCP/IP when -P or --port option is specified.
		@item
		Fixed bug in handling @code{STOP} event after @code{ROTATE} event in
		replication
		@item
		Fixed another buffer overrun in @code{DROP DATABASE}
		@item
		Added @code{Table_locks_immediate} and @code{Table_locks_waited} status
		variables
		@item
		Fixed bug in replication that broke slave server start with existing
		@code{master.info} - bug introduced in 3.23.32
		@code{master.info}. This fixes a bug introduced in 3.23.32.
		@item
		Added @code{SET SQL_SLAVE_SKIP_COUNTER=n} command to recover from
		replication glitches without a full database copy
		replication glitches without a full database copy.
		@item
		Added @code{max_binlog_size} variable - binary log will be rotated
		automatically once the size crosses the limit.
		Added @code{max_binlog_size} variable; the binary log will be rotated
		automatically when the size crosses the limit.
		@item
		Added @code{Last_error}, @code{Last_errno}, and @code{Slave_skip_counter} to
		@code{SHOW SLAVE STATUS}.
		@@ -40935,7 +40971,7 @@ Execute coredump handler on @code{SIGILL}, and @code{SIGBUS} in addition to
		On x86 Linux, print the current query and thread (connection) id, if
		available, in the coredump handler.
		@item
		Fixed several timing bugs in the test suite
		Fixed several timing bugs in the test suite.
		@item
		Extended @code{mysqltest} to take care of the timing issues in the test
		suite.
		@@ -40946,9 +40982,15 @@ suite.
		Fixed creation of @code{MERGE} tables on Windows.
		@item
		Portability fixes for OpenBSD and OS2.
		@item
		Added --temp-pool option to mysqld. Using this option will cause most
		temporary files created to use a small set of names, rather than a unique
		name for each new file. This is to work around a problem in the Linux
		kernel dealing with creating a bunch of new files with different names.
		With the old behavior, Linux seems to "leak" memory, as it's being allocated
		to the directory entry cache instead of the disk cache.
		@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
		@@ -40957,8 +40999,8 @@ Changed code to get around compiler bug in Compaq C++ on OSF1, that broke
		@code{BACKUP}, @code{RESTORE}, @code{CHECK}, @code{REPAIR}, and
		@code{ANALYZE TABLE}.
		@item
		Added option @code{FULL} to @code{SHOW COLUMNS}. Now we only show the
		privilege list for the columns if this option is given.
		Added option @code{FULL} to @code{SHOW COLUMNS}. Now we show the
		privilege list for the columns only if this option is given.
		@item
		Fixed bug in @code{SHOW LOGS} when there weren't any BDB logs.
		@item
		@@ -46742,10 +46784,15 @@ for @code{BDB} tables. @xref{Internal locking}. With @code{MyISAM}
		tables one can freely mix @code{INSERT} and @code{SELECT} without locks
		(@code{Versioning}).

		Starting in version 3.23.33, you can analyze the table lock contention
		on your system by checkining @code{Table_locks_waited} and
		@code{Table_locks_immediate} environemt variables.

		Some database users claim that @strong{MySQL} cannot support near the
		number of concurrent users because it lacks row-level locking. This is
		a may be true for some specific applications, but is' not generally
		true. As always this depends totally on what the application does and what is the access/update pattern of the data.
		true. As always this depends totally on what the application does and what
		is the access/update pattern of the data.

		Pros for row locking:

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':