Cheery picked Antony's patch to allow for Window's builds in 5.1

sql/field.cc

@@ -6571,7 +6571,7 @@ void Field_varstring::sql_type(String &res) const
 }
 
 
-uint Field_varstring::data_length(const char *from)
+uint32 Field_varstring::data_length(const char *from)
 {
   return length_bytes == 1 ? (uint) (uchar) *ptr : uint2korr(ptr);
 }

sql/field.h

@@ -1126,7 +1126,7 @@ public:
   int key_cmp(const byte *str, uint length);
   uint packed_col_length(const char *to, uint length);
   uint max_packed_col_length(uint max_length);
-  uint data_length(const char *from);
+  uint32 data_length(const char *from);
   uint size_of() const { return sizeof(*this); }
   enum_field_types real_type() const { return MYSQL_TYPE_VARCHAR; }
   bool has_charset(void) const

storage/bdb/btree/bt_compare.c

-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2005
- *	Sleepycat Software.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994, 1995, 1996
- *	Keith Bostic.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: bt_compare.c,v 12.1 2005/06/16 20:20:13 bostic Exp $
- */
-
-#include "db_config.h"
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-#endif
-
-#include "db_int.h"
-#include "dbinc/db_page.h"
-#include "dbinc/btree.h"
-
-/*
- * __bam_cmp --
- *	Compare a key to a given record.
- *
- * PUBLIC: int __bam_cmp __P((DB *, const DBT *, PAGE *,
- * PUBLIC:    u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *));
- */
-int
-__bam_cmp(dbp, dbt, h, indx, func, cmpp)
-	DB *dbp;
-	const DBT *dbt;
-	PAGE *h;
-	u_int32_t indx;
-	int (*func)__P((DB *, const DBT *, const DBT *));
-	int *cmpp;
-{
-	BINTERNAL *bi;
-	BKEYDATA *bk;
-	BOVERFLOW *bo;
-	DBT pg_dbt;
-
-	/*
-	 * Returns:
-	 *	< 0 if dbt is < page record
-	 *	= 0 if dbt is = page record
-	 *	> 0 if dbt is > page record
-	 *
-	 * !!!
-	 * We do not clear the pg_dbt DBT even though it's likely to contain
-	 * random bits.  That should be okay, because the app's comparison
-	 * routine had better not be looking at fields other than data/size.
-	 * We don't clear it because we go through this path a lot and it's
-	 * expensive.
-	 */
-	switch (TYPE(h)) {
-	case P_LBTREE:
-	case P_LDUP:
-	case P_LRECNO:
-		bk = GET_BKEYDATA(dbp, h, indx);
-		if (B_TYPE(bk->type) == B_OVERFLOW)
-			bo = (BOVERFLOW *)bk;
-		else {
-			pg_dbt.data = bk->data;
-			pg_dbt.size = bk->len;
-			*cmpp = func(dbp, dbt, &pg_dbt);
-			return (0);
-		}
-		break;
-	case P_IBTREE:
-		/*
-		 * The following code guarantees that the left-most key on an
-		 * internal page at any place in the tree sorts less than any
-		 * user-specified key.  The reason is that if we have reached
-		 * this internal page, we know the user key must sort greater
-		 * than the key we're storing for this page in any internal
-		 * pages at levels above us in the tree.  It then follows that
-		 * any user-specified key cannot sort less than the first page
-		 * which we reference, and so there's no reason to call the
-		 * comparison routine.  While this may save us a comparison
-		 * routine call or two, the real reason for this is because
-		 * we don't maintain a copy of the smallest key in the tree,
-		 * so that we don't have to update all the levels of the tree
-		 * should the application store a new smallest key.  And, so,
-		 * we may not have a key to compare, which makes doing the
-		 * comparison difficult and error prone.
-		 */
-		if (indx == 0) {
-			*cmpp = 1;
-			return (0);
-		}
-
-		bi = GET_BINTERNAL(dbp, h, indx);
-		if (B_TYPE(bi->type) == B_OVERFLOW)
-			bo = (BOVERFLOW *)(bi->data);
-		else {
-			pg_dbt.data = bi->data;
-			pg_dbt.size = bi->len;
-			*cmpp = func(dbp, dbt, &pg_dbt);
-			return (0);
-		}
-		break;
-	default:
-		return (__db_pgfmt(dbp->dbenv, PGNO(h)));
-	}
-
-	/*
-	 * Overflow.
-	 */
-	return (__db_moff(dbp, dbt,
-	    bo->pgno, bo->tlen, func == __bam_defcmp ? NULL : func, cmpp));
-}
-
-/*
- * __bam_defcmp --
- *	Default comparison routine.
- *
- * PUBLIC: int __bam_defcmp __P((DB *, const DBT *, const DBT *));
- */
-int
-__bam_defcmp(dbp, a, b)
-	DB *dbp;
-	const DBT *a, *b;
-{
-	size_t len;
-	u_int8_t *p1, *p2;
-
-	COMPQUIET(dbp, NULL);
-
-	/*
-	 * Returns:
-	 *	< 0 if a is < b
-	 *	= 0 if a is = b
-	 *	> 0 if a is > b
-	 *
-	 * XXX
-	 * If a size_t doesn't fit into a long, or if the difference between
-	 * any two characters doesn't fit into an int, this routine can lose.
-	 * What we need is a signed integral type that's guaranteed to be at
-	 * least as large as a size_t, and there is no such thing.
-	 */
-	len = a->size > b->size ? b->size : a->size;
-	for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2)
-		if (*p1 != *p2)
-			return ((long)*p1 - (long)*p2);
-	return ((long)a->size - (long)b->size);
-}
-
-/*
- * __bam_defpfx --
- *	Default prefix routine.
- *
- * PUBLIC: size_t __bam_defpfx __P((DB *, const DBT *, const DBT *));
- */
-size_t
-__bam_defpfx(dbp, a, b)
-	DB *dbp;
-	const DBT *a, *b;
-{
-	size_t cnt, len;
-	u_int8_t *p1, *p2;
-
-	COMPQUIET(dbp, NULL);
-
-	cnt = 1;
-	len = a->size > b->size ? b->size : a->size;
-	for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2, ++cnt)
-		if (*p1 != *p2)
-			return (cnt);
-
-	/*
-	 * They match up to the smaller of the two sizes.
-	 * Collate the longer after the shorter.
-	 */
-	if (a->size < b->size)
-		return (a->size + 1);
-	if (b->size < a->size)
-		return (b->size + 1);
-	return (b->size);
-}

storage/bdb/btree/bt_conv.c

-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2005
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: bt_conv.c,v 12.2 2005/06/16 20:20:13 bostic Exp $
- */
-
-#include "db_config.h"
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-#endif
-
-#include "db_int.h"
-#include "dbinc/db_page.h"
-#include "dbinc/db_swap.h"
-#include "dbinc/btree.h"
-
-/*
- * __bam_pgin --
- *	Convert host-specific page layout from the host-independent format
- *	stored on disk.
- *
- * PUBLIC: int __bam_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
- */
-int
-__bam_pgin(dbenv, dummydbp, pg, pp, cookie)
-	DB_ENV *dbenv;
-	DB *dummydbp;
-	db_pgno_t pg;
-	void *pp;
-	DBT *cookie;
-{
-	DB_PGINFO *pginfo;
-	PAGE *h;
-
-	pginfo = (DB_PGINFO *)cookie->data;
-	if (!F_ISSET(pginfo, DB_AM_SWAP))
-		return (0);
-
-	h = pp;
-	return (TYPE(h) == P_BTREEMETA ?  __bam_mswap(pp) :
-	    __db_byteswap(dbenv, dummydbp, pg, pp, pginfo->db_pagesize, 1));
-}
-
-/*
- * __bam_pgout --
- *	Convert host-specific page layout to the host-independent format
- *	stored on disk.
- *
- * PUBLIC: int __bam_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
- */
-int
-__bam_pgout(dbenv, dummydbp, pg, pp, cookie)
-	DB_ENV *dbenv;
-	DB *dummydbp;
-	db_pgno_t pg;
-	void *pp;
-	DBT *cookie;
-{
-	DB_PGINFO *pginfo;
-	PAGE *h;
-
-	pginfo = (DB_PGINFO *)cookie->data;
-	if (!F_ISSET(pginfo, DB_AM_SWAP))
-		return (0);
-
-	h = pp;
-	return (TYPE(h) == P_BTREEMETA ?  __bam_mswap(pp) :
-	    __db_byteswap(dbenv, dummydbp, pg, pp, pginfo->db_pagesize, 0));
-}
-
-/*
- * __bam_mswap --
- *	Swap the bytes on the btree metadata page.
- *
- * PUBLIC: int __bam_mswap __P((PAGE *));
- */
-int
-__bam_mswap(pg)
-	PAGE *pg;
-{
-	u_int8_t *p;
-
-	__db_metaswap(pg);
-
-	p = (u_int8_t *)pg + sizeof(DBMETA);
-
-	p += sizeof(u_int32_t);	/* unused */
-	SWAP32(p);		/* minkey */
-	SWAP32(p);		/* re_len */
-	SWAP32(p);		/* re_pad */
-	SWAP32(p);		/* root */
-	p += 92 * sizeof(u_int32_t); /* unused */
-	SWAP32(p);		/* crypto_magic */
-
-	return (0);
-}

storage/bdb/btree/bt_reclaim.c

-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1998-2005
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: bt_reclaim.c,v 12.2 2005/06/16 20:20:19 bostic Exp $
- */
-
-#include "db_config.h"
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-
-#include <string.h>
-#endif
-
-#include "db_int.h"
-#include "dbinc/db_page.h"
-#include "dbinc/btree.h"
-
-/*
- * __bam_reclaim --
- *	Free a database.
- *
- * PUBLIC: int __bam_reclaim __P((DB *, DB_TXN *));
- */
-int
-__bam_reclaim(dbp, txn)
-	DB *dbp;
-	DB_TXN *txn;
-{
-	DBC *dbc;
-	int ret, t_ret;
-
-	/* Acquire a cursor. */
-	if ((ret = __db_cursor(dbp, txn, &dbc, 0)) != 0)
-		return (ret);
-
-	/* Walk the tree, freeing pages. */
-	ret = __bam_traverse(dbc,
-	    DB_LOCK_WRITE, dbc->internal->root, __db_reclaim_callback, dbc);
-
-	/* Discard the cursor. */
-	if ((t_ret = __db_c_close(dbc)) != 0 && ret == 0)
-		ret = t_ret;
-
-	return (ret);
-}
-
-/*
- * __bam_truncate --
- *	Truncate a database.
- *
- * PUBLIC: int __bam_truncate __P((DBC *, u_int32_t *));
- */
-int
-__bam_truncate(dbc, countp)
-	DBC *dbc;
-	u_int32_t *countp;
-{
-	db_trunc_param trunc;
-	int ret;
-
-	trunc.count = 0;
-	trunc.dbc = dbc;
-
-	/* Walk the tree, freeing pages. */
-	ret = __bam_traverse(dbc,
-	    DB_LOCK_WRITE, dbc->internal->root, __db_truncate_callback, &trunc);
-
-	if (countp != NULL)
-		*countp = trunc.count;
-
-	return (ret);
-}

storage/bdb/build_unix/.IGNORE_ME

-Some combinations of the gzip and tar archive exploders found
-on Linux systems ignore directories that don't have any files
-(other than symbolic links) in them.  So, here's a file.

storage/bdb/build_win32/db_java_xaj.mak

-JAVA_XADIR=../java/src/com/sleepycat/db/xa
-
-JAVA_XASRCS=\
-	$(JAVA_XADIR)/DbXAResource.java \
-	$(JAVA_XADIR)/DbXid.java
-
-Release/dbxa.jar : $(JAVA_XASRCS)
-	@echo compiling Berkeley DB XA classes 
-	@javac -g -d ./Release/classes -classpath "$(CLASSPATH);./Release/classes" $(JAVA_XASRCS)
-	@echo creating jar file 
-	@cd .\Release\classes 
-	@jar cf ../dbxa.jar com\sleepycat\db\xa\*.class 
-	@echo Java XA build finished 
-
-Debug/dbxa.jar : $(JAVA_XASRCS)
-	@echo compiling Berkeley DB XA classes 
-	@javac -g -d ./Debug/classes -classpath "$(CLASSPATH);./Debug/classes" $(JAVA_XASRCS)
-	@echo creating jar file 
-	@cd .\Debug\classes 
-	@jar cf ../dbxa.jar com\sleepycat\db\xa\*.class 
-	@echo Java XA build finished 

storage/bdb/build_win32/libdb_tcl.def

-; $Id: libdb_tcl.def,v 12.0 2004/11/17 03:48:15 bostic Exp $
-
-DESCRIPTION     'Berkeley DB TCL interface Library'
-EXPORTS
-	Db_tcl_Init
-	_NameToPtr
-

storage/bdb/build_win32/libdbrc.src

-1 VERSIONINFO
- FILEVERSION %MAJOR%,0,%MINOR%,%PATCH%
- PRODUCTVERSION %MAJOR%,0,%MINOR%,%PATCH%
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Sleepycat Software\0"
-            VALUE "FileDescription", "Berkeley DB %MAJOR%.%MINOR% DLL\0"
-            VALUE "FileVersion", "%MAJOR%.%MINOR%.%PATCH%\0"
-            VALUE "InternalName", "libdb%MAJOR%%MINOR%.dll\0"
-            VALUE "LegalCopyright", "Copyright  Sleepycat Software Inc. 1997-2005\0"
-            VALUE "OriginalFilename", "libdb%MAJOR%%MINOR%.dll\0"
-            VALUE "ProductName", "Sleepycat Software libdb\0"
-            VALUE "ProductVersion", "%MAJOR%.%MINOR%.%PATCH%\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

storage/bdb/build_win32/srcfile_dsp.src

-# Begin Source File
-
-SOURCE=@srcdir@\@srcfile@
-# End Source File