Bug 718455 - Upgrade SQLite to version 3.7.10 - Mozilla changes. r=mak
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 16 Jan 2012 16:15:57 -0500
changeset 86441 0acc0724334936a1a54f452b339f00ddbe545ccc
parent 86440 5200b73a4e4e7ab268327da8ae508053d4d76ae1
child 86442 92b6a058907f028442db6d32a3d1c4ede077b488
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs718455
milestone12.0a1
Bug 718455 - Upgrade SQLite to version 3.7.10 - 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.7.1
+SQLITE_VERSION=3.7.10
 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,22 +1,21 @@
-This is sqlite 3.7.7.1
+This is sqlite 3.7.10
 
--- Marco Bonardo <mak77@bonardo.net>, 08/2011
+-- Ryan VanderMeulen <ryanvm@gmail.com>, 01/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:
 
-Simply copy the sqlite3.h and sqlite3.c files from the amalgamation of sqlite.
-
-Also copy test_quota.h and test_quota.c from the full source package.
+Copy the sqlite3.h and sqlite3.c files from the amalgamation of sqlite. Also,
+copy test_quota.h and test_quota.c from the full source package.
 
 Be sure to update SQLITE_VERSION accordingly in $(topsrcdir)/configure.in as
 well as the version number at the top of this file.
 
 -- Paul O’Shannessy <paul@oshannessy.com>, 01/2011
 
 We are using an experimental quota management feature included in test_quota.c.
 This file is not compiled into mozsqlite, but instead included directly into
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -138,18 +138,16 @@ ifeq ($(OS_ARCH),OS2)
 ifdef MOZ_OS2_HIGH_MEMORY
 DEFINES += -DOS2_HIGH_MEMORY
 endif
 endif
 
 ifeq ($(OS_TARGET),Android)
 # default to user readable only to fit Android security model
 DEFINES += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600
-# Force using fsync, since there is not fdatasync in ndk 5.
-DEFINES += -Dfdatasync=fsync
 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)
 
 ifeq ($(OS_ARCH),OS2)