Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql (30bcd690) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/compile-alpha-ccc

+3 −1

Original line number	Diff line number	Diff line
		@@ -6,11 +6,13 @@ aclocal; autoheader; aclocal; automake; autoconf

		CC=ccc CFLAGS="-fast -O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mcpu=ev6 -Wa,-mev6" CXXLDFLAGS='/usr/lib/compaq/libots-2.2.7/libots.so /usr/lib/compaq/cpml-5.0.0/libcpml_ev6.a' ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client
		make
		rm /.deps/
		make
		if [ $? = 0 ]
		then
		rm /.deps/
		bin/mysqladmin shutdown
		make install
		sur make install
		if [ $? = 0 ]
		then
		scripts/make_binary_distribution

Docs/manual.texi

+50 −25

Original line number	Diff line number	Diff line
		@@ -5917,12 +5917,12 @@ The solution to this is to do one of the following steps:

		@itemize @bullet
		@item
		Configure with @code{CFLAGS=-DHAVE_CURSES_H CXXFLAGS=-DHAVE_CURSES_H ./configure}
		@item
		Edit @file{/usr/include/widec.h} as indicted above and rerun configure
		@item
		Remove the @code{#define HAVE_TERM} line from @file{config.h} file and
		run @code{make} again.
		@item
		Configure with @code{CFLAGS=-DHAVE_CURSES CXXFLAGS=-DHAVE_CURSES ./configure}
		@end itemize

		If you get a problem that your linker can't find @code{-lz} when linking
		@@ -5950,9 +5950,9 @@ experience problems with core dumps under load, you should use the
		following @code{configure} command:

		@example
		shell> CC=gcc CFLAGS="-O6 -fomit-frame-pointer" \
		shell> CC=gcc CFLAGS="-O6 -fomit-frame-pointer -DHAVE_CURSES_H" \
		CXX=gcc \
		CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" \
		CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -DHAVE_CURSES_H" \
		./configure --prefix=/usr/local/mysql
		@end example

		@@ -8557,6 +8557,11 @@ LOW_PRIORITY ...} to lower the priority of only one query, or by
		priority in one thread.
		@xref{Table locking}.

		@item --memlock
		Lock the @code{mysqld} process in memory. This works only if your system
		supports the @code{mlockall()} system call. This may help if you have
		a problem where the opearting system is causing @code{mysqld} to swap on disk.

		@item --pid-file=path
		Path to pid file used by @code{safe_mysqld}.

		@@ -8597,6 +8602,11 @@ because sometimes it takes a long time to perform backward resolutions.
		@strong{MySQL} 3.22 caches hostnames (unless @code{--skip-host-cache} is
		used) and has this option enabled by default.

		@item --skip-concurrent-insert
		Turn of that one can insert and select at the same time on @code{MyISAM}
		tables. (This is only to be used if you think you have found a bug
		in this feature).

		@item --skip-delay-key-write
		Ignore the @code{delay_key_write} option for all tables.
		@xref{Server parameters}.
		@@ -10210,13 +10220,14 @@ The following @code{mysqld} options affect networking security:

		@table @code
		@item --secure
		IP numbers returned by the @code{gethostbyname()} system call are checked to
		make sure they resolve back to the original hostname. This makes it harder
		for someone on the outside to get access by pretending to be another host. This
		option also adds some sanity checks of hostnames. The option is turned off
		by default in @strong{MySQL} 3.21 because sometimes it takes a long time to
		perform backward resolutions. @strong{MySQL} 3.22 caches hostnames and has
		this option enabled by default.
		IP numbers returned by the @code{gethostbyname()} system call are
		checked to make sure they resolve back to the original hostname. This
		makes it harder for someone on the outside to get access by pretending
		to be another host. This option also adds some sanity checks of
		hostnames. The option is turned off by default in @strong{MySQL} 3.21
		because sometimes it takes a long time to perform backward resolutions.
		@strong{MySQL} 3.22 caches hostnames and has this option enabled by
		default.

		@item --skip-grant-tables
		This option causes the server not to use the privilege system at all. This
		@@ -17953,6 +17964,10 @@ files directly, because the contents of the file must travel from the client
		host to the server host. On the other hand, you do not need the
		@strong{file} privilege to load local files.

		Note that you can't read from a FIFO with @code{LOAD DATA INFILE}; If
		you need to read from a FIFO (for example the output from gunzip), use
		@code{LOAD DATA LOCAL INFILE} instead.

		@cindex @code{mysqlimport}
		You can also load data files by using the @code{mysqlimport} utility; it
		operates by sending a @code{LOAD DATA INFILE} command to the server. The
		@@ -35513,12 +35528,13 @@ only on Linux.
		You can always find the latest version
		@uref{http://www.trash.net/~ffischer/admin/index.html, here}.

		@item @uref{http://www.mysql.com/Downloads/Win32/MySQL-Maker092.zip,MySQL-Maker 092}.
		Shareware @strong{MySQL} client for windows. It's WYSIWYG tool which allows
		you to create, change and delete databases and tables.
		You can change field - structure and add, change and delete data in
		these tables directly without ODBC-driver.
		@uref{http://62.26.183.157/presult/support/su_sweiche_download.html, MySQL Maker homepage}
		@c Link temporary removed on request because of a bug in the current version
		@c @item @uref{http://www.mysql.com/Downloads/Win32/MySQL-Maker092.zip,MySQL-Maker 092}.
		@c Shareware @strong{MySQL} client for windows. It's WYSIWYG tool which allows
		@c you to create, change and delete databases and tables.
		@c You can change field - structure and add, change and delete data in
		@c these tables directly without ODBC-driver.
		@c @uref{http://62.26.183.157/presult/support/su_sweiche_download.html, MySQL Maker homepage}

		@item @uref{http://www.mysql.com/Downloads/Contrib/mysqlwinadmn.zip, mysqlwinadmn.zip}
		Windows GUI (binary only) to administrate a database, by David B. Mansel,
		@@ -35653,9 +35669,9 @@ programming! By Marc Beneteau, @email{marc@@odbsoft.com}.
		@item @uref{http://www.mysql.com/Downloads/Contrib/sqlhtml.tar.gz, sqlhtml.tar.gz}
		SQL/HTML is an HTML database manager for @strong{MySQL} using @code{DBI} 1.06.

		@item @uref{http://www.mysql.com/Downloads/Contrib/udmsearch-3.0.21.tar.gz, UdmSearch 3.0.21 (stable version)}
		@item @uref{http://www.mysql.com/Downloads/Contrib/udmsearch-3.0.21.tar.gz, UdmSearch 3.0.22 (stable version)}
		@item @uref{http://www.mysql.com/Downloads/Contrib/udmsearch-3.1.3.tar.gz, UdmSearch 3.1.3 (development version)}
		@item @uref{http://mysearch.udm.net, UdmSearch home page}
		@item @uref{http://search.mnoGo.ru, UdmSearch home page}
		A SQL-based search engine for Internet. By
		Alexander I. Barkov @email{bar@@izhcom.ru}.

		@@ -36291,6 +36307,19 @@ though, so 3.23 is not released as a stable version yet.
		@appendixsubsec Changes in release 3.23.25
		@itemize @bullet
		@item
		Fixed a core dump bug when doing @code{FLUSH MASTER} when one didn't give
		a filename argument to @code{--log-bin}
		@item
		Added missing ha_berkeley.x files to the MySQL windows source distribution.
		@item
		Fixed some mutex bugs in the log code that could cause thread blocks if new
		log files couldn't be created.
		@item
		Added lock time and number of selected processed rows to slow query log.
		@item
		Added @code{--memlock} option to mysqld to lock mysqld in memory on
		systems with the @code{mlockall()} call (like in Solaris).
		@item
		@code{HEAP} tables didn't use keys properly. (Bug from 3.23.23)
		@item
		Added better support for @code{MERGE} tables (keys, mapping, creation,
		@@ -40543,6 +40572,8 @@ Subqueries. @code{select id from t where grp in (select grp from g where u > 100
		@item
		Add range checking to @code{MERGE} tables.
		@item
		@code{SHOW OPEN TABLES}
		@item
		Port of @strong{MySQL} to BeOS.
		@item
		Add a temporary key buffer cache during @code{insert/delete/update} so that we
		@@ -40802,18 +40833,12 @@ Negative @code{LIMIT} to retrieve data from the end.
		@item
		Alarm around client connect/read/write functions.
		@item
		Make a @code{mysqld} version which isn't multithreaded (3-5 days).
		@item
		Please note the changes to @code{safe_mysqld}: according to FSSTND (which
		Debian tries to follow) PID files should go into @file{/var/run/<progname>.pid}
		and log files into @file{/var/log}. It would be nice if you could put the
		"DATADIR" in the first declaration of "pidfile" and "log", so the
		placement of these files can be changed with a single statement.
		@item
		Better dynamic record layout to avoid fragmentation.
		@item
		@code{UPDATE SET blob=read_blob_from_file('my_gif') where id=1;}
		@item
		Allow a client to request logging.
		@item
		Add use of @code{zlib()} for @code{gzip}-ed files to @code{LOAD DATA INFILE}.

configure.in

+2 −2

Original line number	Diff line number	Diff line
		@@ -1172,7 +1172,7 @@ AC_SUBST(MAKE_SHELL)
		# Already-done: stdlib.h string.h unistd.h termios.h
		AC_CHECK_HEADERS(varargs.h stdarg.h dirent.h locale.h ndir.h sys/dir.h \
		sys/file.h sys/ndir.h sys/ptem.h sys/pte.h sys/select.h sys/stream.h \
		curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h)
		sys/mman.h curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h)

		# Already-done: strcasecmp
		AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
		@@ -1218,7 +1218,7 @@ AC_CHECK_FUNCS(alarm bmove \
		pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam \
		pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \
		pthread_condattr_create rwlock_init pthread_rwlock_rdlock \
		crypt dlopen dlerror fchmod getpass getpassphrase initgroups)
		crypt dlopen dlerror fchmod getpass getpassphrase initgroups, mlockall)

		# Sanity check: We chould not have any fseeko symbol unless
		# large_file_support=yes

include/my_sys.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -179,11 +179,12 @@ extern void free_charsets(void);
		extern char list_charsets(myf want_flags); / my_free() this string... */


		/* statisticts */
		/* statistics */
		extern ulong _my_cache_w_requests,_my_cache_write,_my_cache_r_requests,
		_my_cache_read;
		extern ulong _my_blocks_used,_my_blocks_changed;
		extern uint my_file_opened,my_stream_opened;
		extern my_bool key_cache_inited;

		/* Point to current my_message() */
		extern void (*my_sigtstp_cleanup)(void),

myisammrg/myrg_close.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,7 @@

		#include "mymrgdef.h"

		int myrg_close(info)
		register MYRG_INFO *info;
		int myrg_close(MYRG_INFO *info)
		{
		int error=0,new_error;
		MYRG_TABLE *file;
		@@ -28,6 +27,7 @@ register MYRG_INFO *info;
		for (file=info->open_tables ; file != info->end_table ; file++)
		if ((new_error=mi_close(file->table)))
		error=new_error;
		delete_queue(&info->by_key);
		pthread_mutex_lock(&THR_LOCK_open);
		myrg_open_list=list_delete(myrg_open_list,&info->open_list);
		pthread_mutex_unlock(&THR_LOCK_open);