Bug 737807 - Upgrade SQLite to version 3.7.11 (Mozilla changes). r=mak
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 23 Mar 2012 21:49:40 -0400
changeset 93549 1dd79bbc16e480a129de2184e8b9e2d27ecb80da
parent 93548 c38c2569a026d41cbe5788d2e95dad7be9817208
child 93550 3f5e4cca2b5bcf4bbeed1e8dd4bc0a1e6e1d8ab9
push idunknown
push userunknown
push dateunknown
reviewersmak
bugs737807
milestone14.0a1
Bug 737807 - Upgrade SQLite to version 3.7.11 (Mozilla changes). r=mak
configure.in
db/sqlite3/README.MOZILLA
db/sqlite3/src/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -124,17 +124,17 @@ GTK2_VERSION=2.10.0
 WINDRES_VERSION=2.14.90
 W32API_VERSION=3.14
 GNOMEVFS_VERSION=2.0
 GNOMEUI_VERSION=2.2.0
 GCONF_VERSION=1.2.1
 GIO_VERSION=2.18
 STARTUP_NOTIFICATION_VERSION=0.8
 DBUS_VERSION=0.60
-SQLITE_VERSION=3.7.10
+SQLITE_VERSION=3.7.11
 LIBNOTIFY_VERSION=0.4
 
 MSMANIFEST_TOOL=
 
 dnl Set various checks
 dnl ========================================================
 MISSING_X=
 AC_PROG_AWK
--- a/db/sqlite3/README.MOZILLA
+++ b/db/sqlite3/README.MOZILLA
@@ -1,11 +1,11 @@
-This is sqlite 3.7.10
+This is sqlite 3.7.11
 
--- Ryan VanderMeulen <ryanvm@gmail.com>, 01/2012
+-- Ryan VanderMeulen <ryanvm@gmail.com>, 03/2012
 
 See http://www.sqlite.org/ for more info.
 
 We have a mozilla-specific Makefile.in in src/ (normally no
 Makefile.in there) that we use to build.
 
 To move to a new version:
 
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -150,17 +150,20 @@ ifeq ($(OS_TARGET),Android)
 # default to user readable only to fit Android security model
 DEFINES += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600
 endif
 
 # Force using malloc_usable_size when building with jemalloc because _msize
 # causes assertions on Win64. See bug 719579.
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_MEMORY
-DEFINES += -DHAVE_MALLOC_USABLE_SIZE
+DEFINES += \
+  -DHAVE_MALLOC_USABLE_SIZE \
+  -DSQLITE_WITHOUT_MSIZE \
+  $(NULL)
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 # next line allows use of MOZ_OBJDIR in .mozconfig with older gcc on BeOS, maybe others
 LOCAL_INCLUDES += -I$(srcdir)