Merge (1cca44ab) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/Support/test-make-manual

+3 −1

Original line number	Diff line number	Diff line
		@@ -129,6 +129,8 @@ echo "If you would like to use a different browser, set the 'BROWSER' environmen
		echo "variable."
		echo

		$BROWSER file://`pwd`/manual_toc.html
		$BROWSER file:`pwd`/manual_toc.html

		echo "-- Press Enter to Continue --"
		read
		cleanup

Docs/manual.texi

+15 −4

Original line number	Diff line number	Diff line
		@@ -4319,6 +4319,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
		@image{Flags/netherlands} Netherlands [Silverpoint] @
		@uref{http://mysql.silverpoint.nl/, WWW}

		@item
		@c EMAIL: mysql@widexs.nl (Wouter de Jong)
		@image{Flags/netherlands} Netherlands [Widexs BV] @
		@uref{http://mysql.widexs.nl/, WWW}
		@uref{ftp://mysql.widexs.nl/pub/mysql/, FTP}

		@item
		@c EMAIL: W.Sylwestrzak@icm.edu.pl (Wojtek Sylwestrzak)
		@c mirroring nightly at 05:25
		@@ -4435,11 +4441,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
		@uref{http://ftp.plig.org/pub/mysql/, WWW}
		@uref{ftp://ftp.plig.org/pub/mysql/, FTP}

		@item
		@c @item
		@c lance@uklinux.net (Lance)
		@image{Flags/great-britain} UK [uklinux.net] @
		@uref{http://mirror.uklinux.net/mysql/, WWW}
		@uref{ftp://mirror.uklinux.net/pub/mysql/, FTP}
		@c @image{Flags/great-britain} UK [uklinux.net] @
		@c @uref{http://mirror.uklinux.net/mysql/, WWW}
		@c @uref{ftp://mirror.uklinux.net/pub/mysql/, FTP}

		@c @item
		@c unknown
		@@ -40600,6 +40606,7 @@ for all MySQL fieldtypes (version 2001.1.1). By SciBit @uref{http://www.scibit.c
		@item @uref{http://www.fastflow.it/mylua/, MyLUA home page}
		How to use the LUA language to write @strong{MySQL} @code{PROCEDURE} that can
		be loaded runtime.

		@itemize @bullet
		@item @uref{http://www.mysql.com/Downloads/Contrib/lua-4.0.tar.gz, Lua 4.0}
		LUA 4.0
		@@ -40607,6 +40614,10 @@ LUA 4.0
		Patch for MySQL 3.23.32 to use LUA 4.0. By Cristian Giussani.
		@end itemize

		@item @uref{http://www.mysql.com/Downloads/Contrib/patched_myodbc.zip, patched_myodbc.zip}
		Patch (for Omniform 4.0 support) to the MyODBC driver.
		By Thomas Thaele @email{tthaele@@papenmeier.de}

		@end itemize

		@appendixsec Clients

innobase/include/os0file.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ Created 10/21/1995 Heikki Tuuri
		#endif

		#ifndef S_IRUSR
		#define
		#define S_IRUSR 00400
		#define S_IWUSR 00200
		#define S_IRGRP 00040

mysql-test/r/bdb-crash.result

0 → 100644

+3 −0

ChargeID	ServiceID	ChargeDate	ChargeAmount	FedTaxes	ProvTaxes	ChargeStatus	ChargeAuthorizationMessage	ChargeComment	ChargeTimeStamp

1	1	2001-03-01	1.00	1.00	1.00	New	blablabla	NULL	now

2	1	2001-03-01	1.00	1.00	1.00	New	NULL	NULL	now

mysql-test/t/bdb-crash.test

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		# test for bug reported by Mark Steele

		drop table if exists tblChange;
		CREATE TABLE tblCharge (
		ChargeID int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
		ServiceID int(10) unsigned DEFAULT '0' NOT NULL,
		ChargeDate date DEFAULT '0000-00-00' NOT NULL,
		ChargeAmount decimal(20,2) DEFAULT '0.00' NOT NULL,
		FedTaxes decimal(20,2) DEFAULT '0.00' NOT NULL,
		ProvTaxes decimal(20,2) DEFAULT '0.00' NOT NULL,
		ChargeStatus enum('New','Auth','Unauth','Sale','Denied','Refund')
		DEFAULT 'New' NOT NULL,
		ChargeAuthorizationMessage text,
		ChargeComment text,
		ChargeTimeStamp varchar(20),
		PRIMARY KEY (ChargeID),
		KEY ServiceID (ServiceID),
		KEY ChargeDate (ChargeDate)
		) type=BDB;

		BEGIN;
		INSERT INTO tblCharge
		VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
		COMMIT;

		BEGIN;
		UPDATE tblCharge SET ChargeAuthorizationMessage = 'blablabla' WHERE
		ChargeID = 1;
		COMMIT;

		INSERT INTO tblCharge
		VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
		select * from tblCharge;
		drop table tblCharge;