Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 (35118a00) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/FINISH.sh

+0 −8

Original line number	Diff line number	Diff line
		@@ -45,11 +45,3 @@ then
		else
		echo "$commands"
		fi

		comp_finished=sounds/compilation_finished.au.gz

		if [ -c /dev/audio ] && [ -f "$comp_finished" ]
		then
		gunzip -c $comp_finished > /dev/audio
		fi

Docs/manual.texi

+43 −9

Original line number	Diff line number	Diff line
		@@ -326,6 +326,7 @@ Post-installation Setup and Testing

		Upgrading/Downgrading MySQL

		* Upgrading-from-3.23::
		* Upgrading-from-3.22:: Upgrading from a 3.22 version to 3.23
		* Upgrading-from-3.21:: Upgrading from a 3.21 version to 3.22
		* Upgrading-from-3.20:: Upgrading from a 3.20 version to 3.21
		@@ -643,7 +644,6 @@ Replication in MySQL

		MySQL Full-text Search

		* Fulltext Search::
		* Fulltext Fine-tuning::
		* Fulltext Features to Appear in MySQL 4.0::
		* Fulltext TODO::
		@@ -10828,15 +10828,39 @@ particularly if you notice symptoms such as all your @code{DBI} scripts
		dumping core after you upgrade @strong{MySQL}.

		@menu
		* Upgrading-from-3.23::
		* Upgrading-from-3.22:: Upgrading from a 3.22 version to 3.23
		* Upgrading-from-3.21:: Upgrading from a 3.21 version to 3.22
		* Upgrading-from-3.20:: Upgrading from a 3.20 version to 3.21
		* Upgrading-to-arch:: Upgrading to another architecture
		@end menu

		@cindex compatibility, between MySQL versions
		@cindex upgrading, 3.23 to 4.0
		@node Upgrading-from-3.23, Upgrading-from-3.22, Upgrade, Upgrade
		@subsection Upgrading From Version 3.23 to Version 4.0

		You can use your old data files without any modification with Version 4.0

		All old clients will work with a Version 4.0 server.

		The following lists tell what you have to watch out for when upgrading to
		Version 4.0;

		@itemize @bullet
		@item
		You should use @code{TRUNCATE TABLE} when you want to delete all rows
		from a table and you don't care of how many rows where deleted.
		(Because @code{TRUNCATE TABLE} is faster than @code{DELETE FROM table_name}).
		@item
		You will get an error if you have an active @code{LOCK TABLES} or
		transaction when trying to execute @code{TRUNCATE TABLE} or @code{DROP
		DATABASE}.
		@end itemize

		@cindex compatibility, between MySQL versions
		@cindex upgrading, 3.22 to 3.23
		@node Upgrading-from-3.22, Upgrading-from-3.21, Upgrade, Upgrade
		@node Upgrading-from-3.22, Upgrading-from-3.21, Upgrading-from-3.23, Upgrade
		@subsection Upgrading From Version 3.22 to Version 3.23

		@strong{MySQL} Version 3.23 supports tables of the new @code{MyISAM} type and
		@@ -20108,16 +20132,19 @@ the @code{LIMIT} value.
		TRUNCATE TABLE table_name
		@end example

		Is in 3.23 and the same thing as @code{DELETE FROM table_name}. @xref{DELETE}.
		The differences are:
		In 3.23 @code{TRUNCATE TABLE} is mapped to
		@code{COMMIT ; DELETE FROM table_name}. @xref{DELETE}.

		The differences between @code{TRUNCATE TABLE} and @code{DELETE FROM ..}
		are:

		@itemize @bullet
		@item
		Implemented as a drop and re-create of the table, which makes this
		much faster when deleting many rows.
		Truncates does a drop and re-create of the table, which is much faster
		than deleting rows one by one.
		@item
		Not transaction-safe; @code{TRUNCATE TABLE} will automatically end the current
		transaction as if @code{COMMIT} would have been called.
		Not transaction-safe; You will get an error if you have an active
		transaction or an active table lock.
		@item
		Doesn't return the number of deleted rows.
		@item
		@@ -45722,6 +45749,13 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.

		@itemize @bullet
		@item
		@code{TRUNCATE TABLE} and @code{DELETE FROM table_name} are now separate
		functions. One bonus is that @code{DELETE FROM table_name} now returns
		the number of deleted rows.
		@item
		@code{DROP DATABASE} now executes a @code{DROP TABLE} on all tables in
		the database, which fixes a problem with InnoDB tables.
		@item
		Changed WEEK(#,0) to match the calender in the USA.
		@item
		Cleaned up global lock handling for @code{FLUSH TABLES WITH READ LOCK}

configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
		AC_INIT(sql/mysqld.cc)
		AC_CANONICAL_SYSTEM
		# The Docs Makefile.am parses this line!
		AM_INIT_AUTOMAKE(mysql, 4.0.0)
		AM_INIT_AUTOMAKE(mysql, 4.0.0-alpha)
		AM_CONFIG_HEADER(config.h)

		PROTOCOL_VERSION=10

sounds/compilation_finished.au.gz

deleted100644 → 0

−12.1 KiB

File deleted.

View file

sql/ha_innobase.cc

+7 −2

Original line number	Diff line number	Diff line
		@@ -81,13 +81,18 @@ long innobase_mirrored_log_groups, innobase_log_files_in_group,
		innobase_buffer_pool_size, innobase_additional_mem_pool_size,
		innobase_file_io_threads, innobase_lock_wait_timeout;

		char innobase_data_home_dir, innobase_data_file_path;
		char *innobase_data_home_dir;
		char innobase_log_group_home_dir, innobase_log_arch_dir;
		char *innobase_unix_file_flush_method;
		bool innobase_flush_log_at_trx_commit, innobase_log_archive,
		innobase_use_native_aio;

		/* innobase_data_file_path=ibdata:15,idata2:1,... */
		/*
		Set default InnoDB size to 64M, to let users use InnoDB without having
		to specify any startup options.
		*/

		char innobase_data_file_path= (char) "ibdata:64M";

		/* The following counter is used to convey information to InnoDB
		about server activity: in selects it is not sensible to call