]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the latest 3.8.6 beta changes from trunk.
authordrh <drh@noemail.net>
Wed, 6 Aug 2014 01:25:47 +0000 (01:25 +0000)
committerdrh <drh@noemail.net>
Wed, 6 Aug 2014 01:25:47 +0000 (01:25 +0000)
FossilOrigin-Name: 68a6d5e2f43702c78057ae2f2a7345c981d24e17

1  2 
manifest
manifest.uuid
src/insert.c
src/sqlite.h.in
src/sqliteInt.h
src/update.c
src/vdbe.c
test/tester.tcl

diff --cc manifest
index 7b0a5c109462eeea44d7ab895e82eabbcf9ee0ad,a945d8dafc22e55deb90177a8a81ca9cf8597122..125bfcd3c3d7a0db8690f25544738f0989f28c95
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\sfix\sfor\sthe\sCREATE\sUNIQUE\sINDEX\sproblem\sinto\sthe\ssessions\sbranch.
- D 2014-07-30T14:29:54.721
 -C Fix\stypos\sin\sthe\sopcode\sdocumentation.\s\sComment\schanges\sonly.\s\sNo\schanges\nto\scode.
 -D 2014-08-06T01:08:07.269
++C Merge\sthe\slatest\s3.8.6\sbeta\schanges\sfrom\strunk.
++D 2014-08-06T01:25:47.611
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in 639859a6f81bd15921ccd56ddbd6dfd335278377
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc d389ce1d436d21a93a9f5f6211dc45e4b8860962
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -189,16 -175,16 +189,16 @@@ F src/callback.c fcff28cf0df2403dd2f313
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 -F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
 +F src/delete.c 50b74c1dde25d1ebcb4fa5c870762e6470ee46f1
- F src/expr.c b989d07fc7c8780fff77365a4fc59881223e340c
+ F src/expr.c f749009cf4a8534efb5e0d5cd7c9fb1fb0f2836c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
+ F src/fkey.c 8545f3b36da47473e10800ea4fb0810fd4062514
  F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
  F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 3f5e6cb2cfea0c20a11d51da943395ac480122cb
 -F src/insert.c 991e4964e9295da3993e2c0f81c7faf642371848
++F src/insert.c b1f57e168d39fed8a0d3d891bf38091b104dd707
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
@@@ -236,17 -222,17 +236,17 @@@ F src/printf.c af06f66927919730f03479fe
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
+ F src/select.c 1529c49075464c5a95fde77314073612b1b8d595
  F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
- F src/sqlite.h.in c5940e8fdc6b2b046bb00a07edb1cc3fa342bd5d
 -F src/sqlite.h.in 9bbc5815c73b0e77e68b5275481a5e3e7814a804
++F src/sqlite.h.in 6b18f91758d1816f8cc2596d7a2c89c9db348ff5
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 56c7fe562722601d83a53bd8b5262a975851bf95
 -F src/sqliteInt.h 641f8fbb65ca2084c8df95b525f6f82c7a1e91ae
++F src/sqliteInt.h d60dbbadfd64374a5a2f362fc6f45899540c2c8e
  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 3c8bc491d2f8de5adbbf306533cefc343c733927
+ F src/test1.c 14409a611e9c27c6c522c610bbff5561f05c1558
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -293,16 -279,16 +293,16 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c ae45399d6252b4d736af43bee1576ce7bff86aec
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
- F src/update.c 0f16e1d55d642a7ae3199bd0c2c1f51a7ef1b9d4
 -F src/update.c ea336ce7b8b3fc5e316ba8f082e6445babf81059
++F src/update.c b0f38fda25d532343d54b7dc49f55ab73e92ca45
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 79cd84435224f9f4edd420467f3a7bad29fffa8f
 -F src/vdbe.c 2db817cf7c51fa775ecc68160352aefc3d9870f7
 -F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c ac063f36c929f88bf6cecdbcc413000e272265bb
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
++F src/vdbe.c 54fa84fdd992886dcb1a4c0cec2ae686d2d18b2b
 +F src/vdbe.h ca3b6df299adce6e2f499c57e42ae54f142ae823
 +F src/vdbeInt.h 5eee1752eff410de9373196e2b327f7deefb3920
 +F src/vdbeapi.c 52335de5ff97bba93d6779d8df87feab5d53d7df
 +F src/vdbeaux.c c034933f1d417e333d07b63e5a4623cbaeccb361
 +F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
  F src/vdbesort.c f7f5563bf7d4695ca8f3203f3bf9de96d04ed0b3
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -767,8 -753,8 +767,8 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
 -F test/permutations.test bc474bafb022cc5014ef3a9c3d5ab61d6d6f587c
 +F test/permutations.test bf568516e21758f2961a4612f29dc422d3ab75c1
- F test/pragma.test adb21a90875bc54a880fa939c4d7c46598905aa0
+ F test/pragma.test 19d0241a007bcdd77fc2606ec60fc60357e7fc8b
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test bed79b4c3e5da08ba88ad637c0bf62586843cfb1
@@@ -871,14 -856,14 +871,14 @@@ F test/superlock.test 1cde669f68d2dd37d
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
  F test/syscall.test d2fdaad713f103ac611fe7ef9b724c7b69f8149c
  F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6
- F test/table.test 580d23530187026d4502fae74a490f0408cf2cc7
+ F test/table.test 2a1d2fa52c531de5915f28023747d9a8c27b6f31
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
 -F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
 +F test/tclsqlite.test a7308276aad2e6c0bfb5b0414424dd0d9cc0cad7
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 8bab16cd983b4207203d82b7de229aa7b457f575
 -F test/tester.tcl b4ff83a8b069633f4aca788236d10a7086112a49
++F test/tester.tcl eac48cc21d519ac33a4fbaa3b425d178861fe741
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1200,7 -1185,7 +1200,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 8f1beeade0ddf802900c9d203a4fd678d1190394 6b785e92f279cb65746834d5cd25594fd3333342
- R 4306541d4063ef0a1799e70c4c3d4ff7
 -P 0ad1ed8ef0b5fb5d8db44479373b2b93d8fcfd66
 -R 1045cc0c95f68e0f0e2e47642b0ec158
++P 43401ee624587ffa166c3cda7e5265ad0d81da5c 717245d48714c08156c9b7636aaa6c3a402bad66
++R dc185340dec02c23864326e2a38aabfb
  U drh
- Z 69e112d4dad31a7cb28801f346a66d8a
 -Z fecab6dfa8d111d2725130892a38124f
++Z 89e6d570704a9eb31c76806cdd19debb
diff --cc manifest.uuid
index a81b86c76ca0da8eaf35d27753692b151f050da4,c81900087c1a3ac1bf0a884c918a1ee8b305ee47..a60eb67cdda5f90a710abe81a4de426d0dedcc0c
@@@ -1,1 -1,1 +1,1 @@@
- 43401ee624587ffa166c3cda7e5265ad0d81da5c
 -717245d48714c08156c9b7636aaa6c3a402bad66
++68a6d5e2f43702c78057ae2f2a7345c981d24e17
diff --cc src/insert.c
Simple merge
diff --cc src/sqlite.h.in
Simple merge
diff --cc src/sqliteInt.h
Simple merge
diff --cc src/update.c
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc test/tester.tcl
Simple merge