From: drh Date: Tue, 20 May 2014 00:20:23 +0000 (+0000) Subject: Merge recent trunk changes into the sessions branch. X-Git-Tag: version-3.13.0~148^2~143 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d96398204927b5b177cb1ae900ba65353ada9399;p=thirdparty%2Fsqlite.git Merge recent trunk changes into the sessions branch. FossilOrigin-Name: 2d33afe0c43cb99caa521c48b721c3b0971e967c --- d96398204927b5b177cb1ae900ba65353ada9399 diff --cc Makefile.msc index 5fa6ce2358,3d9d9f2eb2..a2e129038b --- a/Makefile.msc +++ b/Makefile.msc @@@ -432,23 -463,20 +465,28 @@@ RCC = $(RCC) -DSQLITE_TEMP_STORE= # The same set of OMIT and ENABLE flags should be passed to the # LEMON parser generator and the mkkeywordhash tool as well. +# BEGIN standard options +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1 +# END standard options + - # BEGIN required Windows option - OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_MAX_TRIGGER_DEPTH=100 - # END required Windows option + # These are the required SQLite compilation options used when compiling for + # the Windows platform. + # + REQ_FEATURE_FLAGS = $(REQ_FEATURE_FLAGS) -DSQLITE_MAX_TRIGGER_DEPTH=100 - TCC = $(TCC) $(OPT_FEATURE_FLAGS) - RCC = $(RCC) $(OPT_FEATURE_FLAGS) + # Add the required and optional SQLite compilation options into the command + # lines used to invoke the MSVC code and resource compilers. + # + TCC = $(TCC) $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) + RCC = $(RCC) $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) - # Add in any optional parameters specified on the make commane line - # ie. make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1". + # Add in any optional parameters specified on the commane line, e.g. + # nmake /f Makefile.msc all "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1" + # TCC = $(TCC) $(OPTS) RCC = $(RCC) $(OPTS) diff --cc main.mk index 57757ccc6a,3bdbe810f8..47c9ae321c --- a/main.mk +++ b/main.mk @@@ -209,11 -210,9 +211,12 @@@ SRC += $(TOP)/ext/icu/sqliteicu.h \ $(TOP)/ext/icu/icu.c SRC += \ + $(TOP)/ext/rtree/sqlite3rtree.h \ $(TOP)/ext/rtree/rtree.h \ $(TOP)/ext/rtree/rtree.c +SRC += \ + $(TOP)/ext/session/sqlite3session.c \ + $(TOP)/ext/session/sqlite3session.h # Generated source code files diff --cc manifest index 551c5d8bd6,6c0b7335d0..dd302e6b0c --- a/manifest +++ b/manifest @@@ -1,10 -1,10 +1,10 @@@ - C Merge\sall\srecent\strunk\senhancements\sand\sfixes\sinto\sthe\ssessions\sbranch. - D 2014-04-28T18:02:21.241 -C Internally,\suse\sa\s64-bit\sintegers\sfor\ssegment\slevel\snumbers. -D 2014-05-17T16:56:52.166 ++C Merge\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch. ++D 2014-05-20T00:20:23.666 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a -F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670 ++F Makefile.in faf03dca4bd103f3e98b317aeba930dea49cfaa1 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc b448317831d9c364bf501538becce5cc1f0a0f8b - F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315 -F Makefile.msc 52911c6bfeaf9b40f47ef4615ab66d98ab0f2b3d ++F Makefile.msc ac23895c1c2928518fa729b3b71bc30a6ab19347 + F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0 F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8 F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -158,7 -144,7 +158,7 @@@ F ext/session/test_session.c 7878ac0e2f F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff - F main.mk 82b154dd823b75c2f1247f1bb98893bf94a5af57 -F main.mk cfa185eed4e0f7e9d28a2e3167cecaa9d6cb39f3 ++F main.mk 341301be4e8956ad69be7c962e1120b85c0b4a1d F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@@ -201,7 -187,7 +201,7 @@@ F src/journal.c b4124532212b6952f42eb2c F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303 - F src/main.c a71db3a3c95e4b435644511cea305f28be73673f -F src/main.c 1c164c7b742f0cd60290b34dc9086df9f939f490 ++F src/main.c d1fbc849b5a06bfd2e3a1952a68515064a0078ba F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b @@@ -232,18 -220,18 +234,18 @@@ F src/printf.c e5a0005f8b3de21f85da6a70 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be - F src/select.c bc7feff0fb4c4a1b9d655b717bef166846b48e33 + F src/select.c 089c4d46f067a5cccae93524c6377f981ba99bd9 F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be - F src/sqlite.h.in 6e6d3e092ca968abb3e65fbe22ec9220a3b616b6 -F src/sqlite.h.in 564fc23db33870b5096b20d72df7491ce0b8b74f ++F src/sqlite.h.in 78ac857a20a16d03b343320973b7da1736ff8fe9 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc - F src/sqliteInt.h 76b4d4f0b9200e58b0a2d5339e2d46b4c7c7c691 -F src/sqliteInt.h 1977f44283be0d3b40da315fb4fd9e21c79fadcc ++F src/sqliteInt.h 01c7555ded7724ef808b27ccbf9af19da526e0a9 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e -F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd +F src/tclsqlite.c 7ada527ce7916adcabad7997c10f09680aac7c9b - F src/test1.c 2401eee14a4309a7cfe2aeb2f30ad517a1d9c299 - F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35 + F src/test1.c 899bddeb0c7fb2b8062de6f03af4a4e4f48f9df5 + F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1 @@@ -255,7 -243,7 +257,7 @@@ F src/test_async.c 21e11293a2f72080eda7 F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12 F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f - F src/test_config.c b131030783f4328beb7008dbfe7392c7f086abc7 -F src/test_config.c dabaa32868974e1ae39770cc17d7e066a9c38e6d ++F src/test_config.c f3865829c8add75c49b3cb53f0494650b9292138 F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f @@@ -289,16 -277,16 +291,16 @@@ F src/test_vfstrace.c bab9594adc976cbe6 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7 F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb -F src/update.c 5b3e74a03b3811e586b4f2b4cbd7c49f01c93115 +F src/update.c 7bb549d61efc6853f5cc708c1de6931179f8a12d F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c - F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf + F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179 - F src/vdbe.c d6038559beb49c57f73a79412821d7143fc276ee -F src/vdbe.c 7f359193bf2366cc914a9ece093ebf284e56acdc -F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4 -F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac ++F src/vdbe.c 9811665adcf4ad9ad67cf1116e3e6adbe901ece3 +F src/vdbe.h d03fcf47890ae1c79a335ca994cb878b302697ca +F src/vdbeInt.h c05d4572211384c560b7579e7a299248cf31d6bd +F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030 +F src/vdbeaux.c e0c2e24ee12c94b6d7cb1c521a0b26cd2e3231d9 +F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447 F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767 @@@ -753,7 -746,7 +760,7 @@@ F test/pagesize.test 1dd51367e752e742f5 F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025 F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54 - F test/permutations.test b7b8b410e3d22e616ff473e588078da6a377c082 -F test/permutations.test d8946218493c77806ec1029df473d8ed4ad9aef6 ++F test/permutations.test f3617ac9b55f63c031c13f5fa9e57116fc597165 F test/pragma.test adb21a90875bc54a880fa939c4d7c46598905aa0 F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13 F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552 @@@ -1148,11 -1140,11 +1155,11 @@@ F tool/mkkeywordhash.c c9e05e4a7bcab8fa F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 - F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02 - F tool/mksqlite3c.tcl 3a7297ac69e6da8089eeb3d3ba986e0e3d6016f4 + F tool/mksqlite3c-noext.tcl 1712d3d71256ca1f297046619c89e77a4d7c8f6d -F tool/mksqlite3c.tcl ba274df71f5e6534b0a913c7c48eabfcbd0934b6 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12 ++F tool/mksqlite3c.tcl d2a3f219da0d86cea1e7e7101f819e187385ea1d +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467 - F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795 - F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5 + F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1 + F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c @@@ -1179,8 -1171,8 +1186,8 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152 F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 - F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff - P 3dca2809352c6c6d56db74447a814f77011c6220 af2cbe64adab5f9e3b0f3da00d06428088589d7f - R 9172deb3091895924031286a7ef97633 + F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9fde5b960af39b187474e5b2909ff0e56d5e0bf9 7e60347e21a7473974061965a8d1f2eadde987e2 -R 760c47be4e4c59e75f81e88f9a3c89bc -U dan -Z a762a27782746cb8cee894bb7c1f28d3 ++P e158812c34b01ce516d26636a489509bf61d1c27 8180e320ee4090e41511836678e49a98c0b228e8 ++R cb7779728ff23dc0c3ee0e1492ef0498 +U drh - Z dedb5680561bda872be1d3df9c89cc1d ++Z 89975b84354827e72d595bf54ff41778 diff --cc manifest.uuid index 0367d488c9,6307ea55eb..7d4a9bdbde --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - e158812c34b01ce516d26636a489509bf61d1c27 -8180e320ee4090e41511836678e49a98c0b228e8 ++2d33afe0c43cb99caa521c48b721c3b0971e967c