diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-10-14 20:50:52 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-10-14 20:55:21 (GMT) |
| commit | 036e6d866bdf104626b38282f45d96d7ba13dc00 (patch) | |
| tree | ef5d22b1139bf550f587abe50d71aa167cf8cb33 | |
| parent | c808ec37722bb90dcbc3858e5c5308a648fd08dc (diff) | |
| download | mxe-036e6d866bdf104626b38282f45d96d7ba13dc00.zip mxe-036e6d866bdf104626b38282f45d96d7ba13dc00.tar.gz mxe-036e6d866bdf104626b38282f45d96d7ba13dc00.tar.bz2 | |
sqlite: update
| -rw-r--r-- | src/sqlite-1.patch | 38 | ||||
| -rw-r--r-- | src/sqlite.mk | 4 |
2 files changed, 2 insertions, 40 deletions
diff --git a/src/sqlite-1.patch b/src/sqlite-1.patch deleted file mode 100644 index e8b36de..0000000 --- a/src/sqlite-1.patch +++ /dev/null @@ -1,38 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From ea6e95e804cfff4d79cf1bee8275a30611e336b1 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 22 Aug 2015 10:58:38 +0200 -Subject: [PATCH] backport fix for severe LEFT JOIN bug - -Do not apply the WHERE-clause pushdown optimization to terms that -originate in the ON or USING clause of a LEFT JOIN. - -taken from https://www.sqlite.org/src/info/351bc22fa9b5a2e5 - -diff --git a/sqlite3.c b/sqlite3.c -index 1344938..a8a1a83 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -111380,6 +111380,9 @@ static int flattenSubquery( - ** enforces this restriction since this routine does not have enough - ** information to know.) - ** -+** (5) The WHERE clause expression originates in the ON or USING clause -+** of a LEFT JOIN. -+** - ** Return 0 if no changes are made and non-zero if one or more WHERE clause - ** terms are duplicated into the subquery. - */ -@@ -111402,6 +111405,7 @@ static int pushDownWhereTerms( - nChng += pushDownWhereTerms(db, pSubq, pWhere->pRight, iCursor); - pWhere = pWhere->pLeft; - } -+ if( ExprHasProperty(pWhere,EP_FromJoin) ) return 0; /* restriction 5 */ - if( sqlite3ExprIsTableConstant(pWhere, iCursor) ){ - nChng++; - while( pSubq ){ --- -2.1.4 - diff --git a/src/sqlite.mk b/src/sqlite.mk index 37d734c..dfc14ab 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3081101 -$(PKG)_CHECKSUM := fb99b0ac038c4a7e48b44b61836cb41d4eeba36b4d0ee757beeab59031a1d3b6 +$(PKG)_VERSION := 3090000 +$(PKG)_CHECKSUM := a324143f4cc35cd7e9605a0a8dec9f9e4861d0be8305f3642e7d05008b77e60d $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2015/$($(PKG)_FILE) |