From: drh Date: Tue, 3 Sep 2013 14:49:07 +0000 (+0000) Subject: Merge in all the latest trunk changes, including the win32-longpath VFS and X-Git-Tag: version-3.13.0~148^2~179 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59255f9a98381960cfede9253277f128895531f6;p=thirdparty%2Fsqlite.git Merge in all the latest trunk changes, including the win32-longpath VFS and the fix for the segfault in the omit-left-join optimization. FossilOrigin-Name: cdd3838b7876639cf99904b2054884247fbff529 --- 59255f9a98381960cfede9253277f128895531f6 diff --cc manifest index 933db6b26c,99db51e4ea..eb2854b561 --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Merge\sfrom\strunk:\s\s(1)\sRecent\sbug\sfixes\s(2)\sSTAT4\ssupport\s(3)\swin32-longpath\nsupport. - D 2013-08-29T15:08:38.537 -C Make\ssure\sthe\somit-noop-left-join\soptimization\sis\snot\sapplied\sif\scolumns\nof\sthe\sLEFT\sJOIN\sare\sused\sin\sthe\sORDER\sBY\sclause.\s\s\nTicket\s[be84e357c035] -D 2013-09-03T14:03:47.008 ++C Merge\sin\sall\sthe\slatest\strunk\schanges,\sincluding\sthe\swin32-longpath\sVFS\sand\nthe\sfix\sfor\sthe\ssegfault\sin\sthe\somit-left-join\soptimization. ++D 2013-09-03T14:49:07.725 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e +F Makefile.in aff38bc64c582dd147f18739532198372587b0f0 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc a97163524522cd829cb91bcf900d07608e025502 +F Makefile.msc a3ad9cc70b639cb8d2fe42d24b5c6c127aaac346 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34 @@@ -199,7 -185,7 +199,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 525985af588234b3d01b48fe856b83d9bdc2d912 -F src/main.c c4c781b06faa2ce4040c32a75fd931a07ba7054e ++F src/main.c 97cc7970a6010e9c7a3cc96d2845b6be947909b6 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa @@@ -232,10 -218,10 +232,10 @@@ F src/resolve.c 9d53899cc6e1f4ec0b4632d F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c 8b148eb851f384412aea57091659d14b369918ca F src/shell.c dbe064d404bb497acd8a44c066cd6b8460a71236 - F src/sqlite.h.in dcca940021f8f6643630fb7711bfd4e3fa002566 -F src/sqlite.h.in ec40aa958a270416fb04b4f72210357bf163d2c5 ++F src/sqlite.h.in d8c9a296c52e115e07eeea9360a43949e2c842fe F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc -F src/sqliteInt.h 600086a5082e2291b0aeeefcfbb546f2bbda67b2 +F src/sqliteInt.h 7806162e2d9796e9d9b6025f0757904b605ff91c F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@@ -291,13 -277,13 +291,13 @@@ F src/update.c 8bacc585ae5d6a85b0944934 F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269 F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9 F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8 -F src/vdbe.c 2b1cd2c7e3d74e6aa99ce2f538bfdd07a00dc2f1 -F src/vdbe.h 4f554b5627f26710c4c36d919110a3fc611ca5c4 -F src/vdbeInt.h cbe71b8b36d8b3bba5709cc3f436c7e3b47b7b08 -F src/vdbeapi.c 96b24b946cf21894f63d9393e821baa2f0a80979 -F src/vdbeaux.c c7fe2695e256dbf254113c4fe90d3ec9aabe3bbe -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69 +F src/vdbe.c 8ebe0cbc71f99b7a6fc6c49d92b555d0b96f3717 +F src/vdbe.h 7aa3ab6210a68471c8490dedfc9aa4ef5684b9a0 +F src/vdbeInt.h 9bf236dc477fb8f1f54b078cf80064663f8a409a +F src/vdbeapi.c ae87d198eb3ce67c02886601baee0fd478092076 +F src/vdbeaux.c 20ec92cdc43374b6537fbd7bc2cf7a28967bbe44 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642 - F src/vdbemem.c 4511e1d2304a7d7916d14be20080036331740fcf + F src/vdbemem.c 75ad7fd8f068a8baaba1cf3a84714ef7d3b7a2b8 F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017 F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc F src/vtab.c 165ce0e797c2cd23badb104c9f2ae9042d6d942c @@@ -730,7 -716,7 +730,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 f71ed33a1e9939ea6e2cde406afedfc46a958088 -F test/permutations.test 47f8c1d3d72ea46863426dcedb1e368f4b6ed70b ++F test/permutations.test e47491436e9fc8647535ab92602e01f3012a5b9d F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178 F test/pragma2.test 224f0381f9411a78ae685cac24c13656a62021b7 F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552 @@@ -1094,8 -1079,8 +1094,8 @@@ F tool/mkkeywordhash.c bb52064aa614e142 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02 - F tool/mksqlite3c.tcl 3e55715d165688d969392d792c81f79552049add -F tool/mksqlite3c.tcl d344cc3144a0271cd853c5e3df36e9f31d78d619 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12 ++F tool/mksqlite3c.tcl 72e4608a3b53994b11cf2d2a6fcd7d868543cd13 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795 F tool/mkvsix.tcl 0be7f7a591f1e83f9199cb82911b66668ca484c9 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 @@@ -1124,7 -1109,7 +1124,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac - P 6cc54de88bba00e07fac9de36caac216d94bf070 d4b6ad3333cc3bad500c2ebf7a6ea552b6762b69 - R d689ec9368fec2d3c01e607f2975aafd -P f7079b5365dd6cd8324a4fb23605e81476122ed6 -R ef683c5e75a524283b39e51db1610c55 ++P e7ebc8f74fe91dee26f952fdf49e427b45448667 0303d6bc7112e6f810ae1bd75cafc5ffc51f5212 ++R cdd791bbe55c5aec396c46dfbe20e9e5 U drh - Z 0eee6dedcb9d483d45a308318f1cb363 -Z 7e7396aa706179eb8731d96e0b228672 ++Z 7030b9cbfaf54b170da506be7cca2cb4 diff --cc manifest.uuid index bc88aac0d3,4af698a9c6..66c3a7fdb8 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - e7ebc8f74fe91dee26f952fdf49e427b45448667 -0303d6bc7112e6f810ae1bd75cafc5ffc51f5212 ++cdd3838b7876639cf99904b2054884247fbff529