Update of interface for BDB tables. (a67ff1bf) · Commits · Software / OSDI20 Artifacts / mariadb

Build-tools/mysql-copyright

+26 −6

Original line number	Diff line number	Diff line
		@@ -3,16 +3,17 @@
		# Untar a MySQL distribution, change the copyright texts,
		# pack it up again to a given directory

		$VER="1.1";
		$VER="1.2";

		use Getopt::Long;

		$opt_help = 0;
		$opt_version = 0;
		$opt_target = "mysql-copyright-target-";
		$opt_target .= `date +%d%m%y-%H%M%S`;
		chop $opt_target;

		GetOptions("help","target=s") \|\| usage();
		GetOptions("help","version","target=s") \|\| error();

		# fix the directory prefix for target dir

		@@ -32,7 +33,13 @@ sub main
		my $REG_VERSION = '[0-9\.\-]+[a-z]?[0-9\.\-]+?(.alpha\|.beta\|.gamma\|pre\d\|[0-9\.\-a-z])?';
		my $target;

		usage() if (!$ARGV[0] \|\| $opt_help);
		if ($opt_version)
		{
		print "$0 version $VER by Jani Tolonen\n";
		exit(0);
		}
		usage() if ($opt_help);
		print error() if ($#ARGV == -1);

		`mkdir -p $opt_target`;
		$pec= $? >> 8;
		@@ -210,3 +217,16 @@ Options:
		EOF
		exit(0);
		}

		####
		#### error
		####

		sub error
		{
		if ($#ARGV == -1)
		{
		print "Too few arguments to $0!\n";
		}
		exit(1);
		}

Docs/manual.texi

+19 −1

Original line number	Diff line number	Diff line
		@@ -7589,7 +7589,7 @@ the DCE libraries while you compile @code{gcc} 2.95!

		For HPUX Version 11.x we recommend @strong{MySQL} 3.23.15 or later.

		If you are using @code{gcc} 2.95.1 on a unpatched HPUX Versiib 11.x system,
		If you are using @code{gcc} 2.95.1 on a unpatched HPUX 11.x system,
		you will get the error:

		@example
		@@ -28666,6 +28666,22 @@ shell> myisamchk /path/to/datadir//.MYI
		* myisamchk other options::
		@end menu

		Note that if you get an error like:

		@example
		myisamchk: warning: 1 clients is using or hasn't closed the table properly
		@end example

		This means that you are trying to check a table that has been updated by
		the another program (like the mysqld server) that hasn't yet closed
		the file or that has died without closing the file properly.

		If you @code{mysqld} is running, you must force a sync/close of all
		tables with @code{FLUSH TABLES} and ensure that no one is using the
		tables while you are running @code{myisamchk}. In MySQL 3.23 the easiest
		way to avoid this problem is to use @code{CHECK TABLE} instead of
		@code{myisamchk} to check tables.

		@cindex options, @code{myisamchk}
		@cindex @code{myisamchk}, options
		@node myisamchk general options, myisamchk check options, myisamchk syntax, myisamchk syntax
		@@ -38157,6 +38173,8 @@ though, so 3.23 is not released as a stable version yet.
		Fixed bug where the automatic repair of MyISAM tables failed sometimes
		when the data file was corrupt.
		@item
		Changed BDB tables to use new compare function in Berkeley DB 3.2.3
		@item
		You can now use Unix sockets with @code{mit-pthreads}
		Added the latin5 (turkish) character set
		@item

acinclude.m4

+4 −4

Original line number	Diff line number	Diff line
		@@ -602,7 +602,7 @@ AC_MSG_RESULT($ac_cv_conv_longlong_to_float)
		dnl ---------------------------------------------------------------------------
		dnl Macro: MYSQL_CHECK_BDB
		dnl Sets HAVE_BERKELEY_DB if inst library is found
		dnl Makes sure db version is >= 3.1.11
		dnl Makes sure db version is >= 3.2.3
		dnl Looks in $srcdir for Berkeley distribution not told otherwise
		dnl ---------------------------------------------------------------------------

		@@ -806,15 +806,15 @@ AC_DEFUN([MYSQL_CHECK_BDB_VERSION], [
		if test $db_major -gt 3
		then
		bdb_version_ok=yes
		elif test $db_major -eq 3 && test $db_minor -gt 1
		elif test $db_major -eq 3 && test $db_minor -gt 2
		then
		bdb_version_ok=yes
		elif test $db_major -eq 3 && test $db_minor -eq 1 && test $db_patch -ge 11
		elif test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -ge 3
		then
		bdb_version_ok=yes
		else
		bdb_version_ok="invalid version $db_major.$db_minor.$db_patch"
		bdb_version_ok="$bdb_version_ok (must be at least version 3.1.11)"
		bdb_version_ok="$bdb_version_ok (must be at least version 3.2.3)"
		fi
		])

include/m_string.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ extern void bmove512(gptr dst,const gptr src,uint len);
		#endif

		#if !defined(HAVE_BMOVE) && !defined(bmove)
		extern void bmove(gptr dst,const char *src,uint len);
		extern void bmove(char dst, const char src,uint len);
		#endif

		extern void bmove_upp(char dst,const char src,uint len);

myisam/mi_check.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -290,14 +290,14 @@ int chk_size(MI_CHECK param, register MI_INFO info)
		if (skr > size && skr != size + MEMMAP_EXTRA_MARGIN)
		{
		error=1;
		mi_check_print_error(param,"Size of datafile is: %-8s Should be: %s",
		mi_check_print_error(param,"Size of datafile is: %-9s Should be: %s",
		llstr(size,buff), llstr(skr,buff2));
		param->retry_without_quick=1; /* Don't use quick repair */
		}
		else
		{
		mi_check_print_warning(param,
		"Size of datafile is: %-8s Should be: %s",
		"Size of datafile is: %-9s Should be: %s",
		llstr(size,buff), llstr(skr,buff2));
		}
		}