]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Bring in all the latest trunk changes, including the Common Table
authordrh <drh@noemail.net>
Fri, 24 Jan 2014 14:05:18 +0000 (14:05 +0000)
committerdrh <drh@noemail.net>
Fri, 24 Jan 2014 14:05:18 +0000 (14:05 +0000)
Expressions implementation.

FossilOrigin-Name: 9b43e559195680e558264c4c00d34dc9cf9d9146

12 files changed:
1  2 
manifest
manifest.uuid
src/delete.c
src/insert.c
src/main.c
src/sqlite.h.in
src/sqliteInt.h
src/tclsqlite.c
src/test_config.c
src/vdbe.c
src/vdbe.h
src/vdbeaux.c

diff --cc manifest
index b54d8eeabecfa5ca5cd55f1caf33facd10a6024e,fb401ca29f337f6bb29c64ce58253b0616424355..bd3002071d946b93b16920fe8e70adf1290522e6
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2013-12-24T12:09:42.648
 -C Add\stest\scases\sshowing\sthe\suse\sof\sORDER\sBY\son\sa\srecursive\squery\sto\scontrol\ndepth-first\sversus\sbreath-first\ssearch\sof\sa\stree.
 -D 2014-01-24T11:16:01.884
++C Bring\sin\sall\sthe\slatest\strunk\schanges,\sincluding\sthe\sCommon\sTable\nExpressions\simplementation.
++D 2014-01-24T14:05:18.988
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 4d4ead6b71d1bf03028fbd61da0ba0ec5e1556e1
 +F Makefile.msc 043280f9ca15befa7236484a6c1448d9271abd73
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 8ed548d87d0a27fd7d7620476f9e25f9fa742d73
@@@ -188,8 -174,8 +188,8 @@@ F src/callback.c 174e3c8656bc29f91d710a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
- F src/delete.c e9806af75b7f4015f6410ad87a2a12c353339499
- F src/expr.c ffe4bc79c66f711f450a6113fbd1943b9b2380f7
 -F src/delete.c 91e1321021db5dc266360531b8b6550009d771ff
++F src/delete.c 80a3947fc234baba91842b90558db67bcd8706ea
+ F src/expr.c 61f9105820d6702d7153dfb6ca3d58e751a5e95a
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 2ab0f5384b70594468ef3ac5c7ed8ca24bfd17d5
  F src/func.c 6325ac2ec10833ccf4d5c36d323709221d37ea19
@@@ -197,12 -183,12 +197,12 @@@ F src/global.c 1d7bb7ea8254ae6a68ed9bfa
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c de6cd4bb09a38560d2dd8ae96ec8b4a7ac6d6d70
 -F src/insert.c a4450f0c46a9f221622e6551ab0953b03c4f8ee8
++F src/insert.c a8a987ba42e7172b144052db79e7246da6ae2ccf
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 2c674289707ebd814b33b8594c930d60861013b9
 -F src/main.c 4a05a9706579c7649d7eebb0094586728eb53fcb
++F src/main.c deaeda63657d005ad9833f2191b7ff65c83e0ded
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -227,23 -213,23 +227,23 @@@ F src/parse.y bd51bc17cbfe7549adb4ca374
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 57fee9a9a617218f5037afbbe49b09da65bde56b
- F src/pragma.c 5ab7279d132143feb77f773688a24ab05da75fd7
+ F src/pragma.c ed409ce4104cf4d9de6ead40ace70974f124853b
  F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
  F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
- F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
+ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 819bb090c9a348d17f69f136cad2bfa9ee9cbb41
- F src/shell.c a3541193d5fce37e91dad8ef46a9505aa7c9b344
- F src/sqlite.h.in 9ccaa04411778b0b3a95df6a9fc9c396b779f0cb
+ F src/select.c 93764e0d81946c070e2c7f1127f35e21efabbcc3
+ F src/shell.c 24722d24d4ea8ca93db35e44db7308de786767ca
 -F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
++F src/sqlite.h.in a92d7fcdcb1a8003a62e916ec49025f27ccb56b8
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h edf19afa8c416413008d9b402f2991e2fb0b3e51
 -F src/sqliteInt.h 87a90ad4818ac5d68d3463eb7fe3ed96e5209b25
++F src/sqliteInt.h e4d4b5db50e69f2ce130d40d324db5b5c5638aa8
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c fa8d54ebdb7d91e0f6e7472ee5d8b7b543e65adb
- F src/test1.c 633e5e6a116acf4473b9289240bcceb5320a9d93
 -F src/tclsqlite.c 46073db71011b6542fde1f234c56a076d5ff23f9
++F src/tclsqlite.c a870d43e3c19663fce878aa4c7cac9c624aab564
+ F src/test1.c 2401eee14a4309a7cfe2aeb2f30ad517a1d9c299
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -256,7 -242,7 +256,7 @@@ F src/test_async.c 21e11293a2f72080eda7
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
- F src/test_config.c cb3342a4d66e1121f094f3c2c165b72bbe289a2b
 -F src/test_config.c 0336e0bdbe541b4af89d7e3dd0656e8e6b51e585
++F src/test_config.c b131030783f4328beb7008dbfe7392c7f086abc7
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -288,18 -274,18 +288,18 @@@ F src/test_thread.c 1e133a40b50e9c035b0
  F src/test_vfs.c e72f555ef7a59080f898fcf1a233deb9eb704ea9
  F src/test_vfstrace.c 3a0ab304682fecbceb689e7d9b904211fde11d78
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/tokenize.c ec4c1a62b890bf1dbcdb966399e140b904c700a4
- F src/trigger.c d84e1f3669e9a217731a14a9d472b1c7b87c87ba
+ F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
+ F src/trigger.c 5c1c0b899ac0ce284763dcb8fdbaa38ecf15ef98
 -F src/update.c c2706a6eb232a96345c35b7e1e75a188e26812bb
 +F src/update.c 3143bbdfc8c2d78b74dba15133df04843221ce0d
  F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
  F src/util.c e71f19b272f05c8695cf747b4bac1732685f9e5c
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c ad89fac32d84b5b40778a20a707206630e9cf655
- F src/vdbe.h 4c15d2c90b52fce24e1bd5eaa783f7451849e95b
 -F src/vdbe.c dede894c2990329f8bc5a70da7de44ce8c3c6bf5
 -F src/vdbe.h e6c4c610fcabad4fa80ebb1efc6822a9367e2b26
 -F src/vdbeInt.h 42db251e9f863401ff847b90d5fe1614c89a6a56
 -F src/vdbeapi.c ce4e68ea4842cc6081046f533d088dcf01d247ad
 -F src/vdbeaux.c 9f4bfc52672acbb0bb4493d6a03603dc5a595ac1
 -F src/vdbeblob.c bc40f98f256f0b34116d6a44b114da4a81a15d33
++F src/vdbe.c c41493ca68c23f421b21bdb0ff1f0e8df7aaa876
++F src/vdbe.h 06016671144c70373331e348fd7edf2b2535ac97
 +F src/vdbeInt.h 08d79db15519f98d6d2c2dedaebfbb7f3d69a6d8
 +F src/vdbeapi.c 647d65813a5595c7f667b9f43d119ecd8d70be08
- F src/vdbeaux.c 4dc5258ac337fd6600d1efb144b34316d2bbe05a
++F src/vdbeaux.c a980f7817ab73afb5efc5fac97097421f0ee8f66
 +F src/vdbeblob.c 6e791541114d482074e031ef8dbc3d5e5c180e23
  F src/vdbemem.c 0e69351b2c6ff7d8b638688c0ae336a26befa6b2
  F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -1162,7 -1152,7 +1167,7 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 32477642d79615fb85680bdac812ad9655cf6902 cc72c5aec7fe93d4a1368517aab949dc98d33003
- R 78ce3efefe8e1d1aa8c19dbbb86af6d1
 -P f4a701d55f5c4e1e62ed64b779ad4fff89dd31b7
 -R 15c1d48ec007e0818a79a87f9c81fe3d
++P cfd110bf5db2c1993a5e2ca718648bd9c17ee22c 83b0b2916589db0184435dbd4c304387f393ed60
++R 5819e16ba708c7c74e3c7382ce1686de
  U drh
- Z 99f0c83c836f43da179f2c44da61e31f
 -Z a61c87789af8810b68d544f76885410e
++Z ab25b0717f386dd1619d1172c5947b1e
diff --cc manifest.uuid
index b9fadc710a6583d3d852046847c2d569571b4b4c,1c78fab271e5baa2d2d02aeb5a3f0116d1c95988..7e8ba52694333b547ab2dc940f7a99ba90b7a710
@@@ -1,1 -1,1 +1,1 @@@
- cfd110bf5db2c1993a5e2ca718648bd9c17ee22c
 -83b0b2916589db0184435dbd4c304387f393ed60
++9b43e559195680e558264c4c00d34dc9cf9d9146
diff --cc src/delete.c
Simple merge
diff --cc src/insert.c
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/sqlite.h.in
Simple merge
diff --cc src/sqliteInt.h
Simple merge
diff --cc src/tclsqlite.c
Simple merge
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc src/vdbe.h
Simple merge
diff --cc src/vdbeaux.c
Simple merge