Merge bk-internal.mysql.com:/home/bk/mysql-4.0 (429f9d05) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+2 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ marko@hundin.mysql.fi
		miguel@hegel.(none)
		miguel@hegel.br
		miguel@hegel.local
		miguel@hegel.txg
		miguel@light.
		miguel@light.local
		miguel@sartre.local
		@@ -86,6 +87,7 @@ monty@tramp.mysql.fi
		monty@work.mysql.com
		mwagner@cash.mwagner.org
		mwagner@evoq.mwagner.org
		mwagner@here.mwagner.org
		mwagner@work.mysql.com
		mysqldev@build.mysql2.com
		nick@mysql.com

Build-tools/my_md5sum

0 → 100755

+124 −0

Original line number	Diff line number	Diff line
		#!/usr/bin/perl
		#
		# my_md5sum
		#
		# Script to clone the 'md5sum' command found on modern systems, since that
		# command is not always found on all systems.
		#
		# Use the "--help" option for more info!
		#
		# Written by Matt Wagner <matt@mysql.com>
		#
		use strict;
		use Digest::MD5;
		use Getopt::Long;

		my $VER= "1.1";

		#
		# Strip the leading path info off the program name ($0). We want 'my_md5sum'
		# not './my_md5sum'.
		#
		$0=~ s/^.*\/(.+)$/$1/;

		my ($opt_check, $opt_help)= undef;

		GetOptions(
		"check\|c" => \$opt_check,
		"help\|h" => \$opt_help,
		) \|\| usage();

		#
		# Put all the [file1 file2 file3 ...]'s into an array
		#
		my @files = @ARGV;

		#
		# Give the "--help" text if:
		# - "--help\|-h" was specified
		# - The number of files given as arguments is nil
		# - The "--check\|-c" option is used with more than one [file] argument
		#
		usage() if $opt_help \|\| $#files == -1 \|\| ($opt_check && $#files > 0);

		# If "--check\|-c", then go into checking
		if ($opt_check)
		{
		open (CHECKFILE, $files[0]) or die "$files[0]: $!";

		while (<CHECKFILE>)
		{
		#
		# Goto the next line in the file if it does not match a typical
		# digest line like:
		#
		# f1007efa2c72daa693981ec764cdeaca Bootstrap
		#
		next if $_!~ m/^([a-z0-9]{32})\s+(.+)$/;

		# Collect the trappings from the above regex
		my $checksum= $1;
		my $checkfile= $2;

		# Generate a fresh MD5 for the file in question
		my $digest= &mkmd5($checkfile);

		# Check the fresh MD5 against what is recorded in the file
		# Print an error message if they don't match, else print OK
		print "$checkfile: FAILED\n" if $digest ne $checksum;
		print "$checkfile: OK\n" if $digest eq $checksum;
		}
		}
		# Else generate the MD5 digest to STDOUT
		else
		{
		foreach my $file (@files)
		{
		my $digest= &mkmd5($file);

		print "$digest $file\n";
		}
		}


		#
		# This routine generates the MD5 digest of a file
		#
		sub mkmd5
		{
		my $file= shift;

		open (FILE, $file) or die "$file: $!";
		binmode(FILE);

		my $digest= Digest::MD5->new->addfile(*FILE)->hexdigest;

		close FILE;

		return $digest;
		}

		#
		# Print the help text
		#
		sub usage
		{
		print <<EOF;

		$0 version $VER by Matt Wagner <matt\@mysql.com>

		Usage:
		$0 [-c [file]] \| [file1...]
		Generates or checks MD5 message digests.

		Options:
		-c, --check Check message digests (default is generate)
		-h, --help Display this text and exit

		The input for -c should be the list of message digests and file names that is
		printed on STDOUT by this program when it generates digests.

		EOF

		exit(0);
		}

acinclude.m4

+3 −2

Original line number	Diff line number	Diff line
		@@ -737,14 +737,15 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [
		---)
		for d in /usr/ssl/include /usr/local/ssl/include /usr/include \
		/usr/include/ssl /opt/ssl/include /opt/openssl/include \
		/usr/local/ssl/include /usr/local/include ; do
		/usr/local/ssl/include /usr/local/include /usr/freeware/include ; do
		if test -f $d/openssl/ssl.h ; then
		OPENSSL_INCLUDE=-I$d
		fi
		done

		for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
		/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do
		/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \
		/usr/freeware/lib32 /usr/local/lib/ ; do
		if test -f $d/libssl.a \|\| test -f $d/libssl.so \|\| test -f $d/libssl.dylib ; then
		OPENSSL_LIB=$d
		fi

extra/perror.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ int main(int argc,char *argv[])
		else
		{
		if (verbose)
		printf("MySql error: %3d = %s\n",code,msg);
		printf("MySQL error: %3d = %s\n",code,msg);
		else
		puts(msg);
		}

innobase/include/mach0data.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ mach_read_from_4(
		/* out: ulint integer */
		byte* b); /* in: pointer to four bytes */
		/*************************************************************
		Writes a ulint in a compressed form. */
		Writes a ulint in a compressed form (1..5 bytes). */
		UNIV_INLINE
		ulint
		mach_write_compressed(
		@@ -168,7 +168,7 @@ mach_read_from_8(
		/* out: dulint integer */
		byte* b); /* in: pointer to 8 bytes */
		/*************************************************************
		Writes a dulint in a compressed form. */
		Writes a dulint in a compressed form (5..9 bytes). */
		UNIV_INLINE
		ulint
		mach_dulint_write_compressed(
		@@ -193,7 +193,7 @@ mach_dulint_read_compressed(
		/* out: read dulint */
		byte* b); /* in: pointer to memory from where to read */
		/*************************************************************
		Writes a dulint in a compressed form. */
		Writes a dulint in a compressed form (1..11 bytes). */
		UNIV_INLINE
		ulint
		mach_dulint_write_much_compressed(