]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Add SQLITE_DBCONFIG_ENABLE_QPSG that forces the query planner stability
authordrh <drh@noemail.net>
Tue, 27 Jun 2017 23:36:44 +0000 (23:36 +0000)
committerdrh <drh@noemail.net>
Tue, 27 Jun 2017 23:36:44 +0000 (23:36 +0000)
guarantee.  This is the fix for ticket [b9f010107724c]

FossilOrigin-Name: b82efd2a24914ace39acf99df75175042471fd73a8d31d66a40b15f63b342e10

1  2 
manifest
manifest.uuid
src/whereexpr.c

diff --cc manifest
index 65309463217efe29836548f977912c7d9a37cb63,700203cf04384ac67b400c14cfefcda970d3619e..f773d74caef2d5923b0d14728e8514c1bfc86005
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\svirtual\stable\sproblem\sthat\scan\soccur\swhen\sthe\svtab\sis\son\sthe\sRHS\sof\sa\nLEFT\sJOIN\sand\sthere\sis\sa\sMATCH\sconstraint\sin\sthe\sON\sclause,\sor\swhen\sthe\svtab\nis\sin\sa\ssub-query\sthat\sis\sthe\sRHS\sof\sa\sLEFT\sJOIN\sand\sthere\sis\sa\sMATCH\nconstraint\sin\sthe\sWHERE\sclause\sof\sthe\ssub-query.
- D 2017-06-27T16:39:01.302
 -C Make\ssure\ssqlite3VdbeSetVarmask()\sis\snever\sinvoked\swhen\sQPSG\sis\senabled.
 -D 2017-06-26T14:46:05.008
++C Add\sSQLITE_DBCONFIG_ENABLE_QPSG\sthat\sforces\sthe\squery\splanner\sstability\nguarantee.\s\sThis\sis\sthe\sfix\sfor\sticket\s[b9f010107724c]
++D 2017-06-27T23:36:44.838
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@@ -407,16 -406,16 +407,16 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c adf3ef9843135b1383321ad751f16f5a40c3f37925154555a3e61653d2a954e8
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c 35ccfae64cecfa843d54a5898c4ab7d6595ce03d147267fa5eecdc8eab39cd6a
 -F src/shell.c 2026e88e7892ba177eae79936285d781f1c449f7a7b4e8d86fd02739d4ead26b
 +F src/shell.c 227b86f2bdd707d0a177a4805a5c0b0378ef8337ab1ad04f5d79dc479568735a
- F src/sqlite.h.in 67fa8bd29808e7988e0ce36c8d4c6043eb1727f94522fc612687aa5af51931e6
+ F src/sqlite.h.in 2555ff1b79a1aadeb4eb761740351dc3027fa08120bf84511633ba75a630e7a8
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h 34a54fb47de2da1465f3d3ba1cd373db880bd5d588b0fe862a073ecacd6ddaae
+ F src/sqliteInt.h 620093497e54998c6b2a01ad98aed9b561716c3db4bde0cc37c8bf2416200bed
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
 -F src/tclsqlite.c 1ac29f18b1b3787a30b45dbbdf6fdc4aa4f1a2f8c7c8fe586beba1b177eba97d
 +F src/tclsqlite.c cbf6313f86400acdf7dbf55fcd218cd28d43110a1210967efbc4f250646f81c0
- F src/test1.c c99f0442918a7a5d5b68a95d6024c211989e6c782c15ced5a558994baaf76a5e
+ F src/test1.c 735f7711e787f30ad4e0001220c580ce456d9f731e22e0e5f86dd5c7e41ccd4d
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -490,7 -489,7 +490,7 @@@ F src/walker.c d46044e7a5842560dfe7122d
  F src/where.c 74b0a05487e44e8c5d28ebe3bd77ca9719b1d5114235bed48079aee309a0bb4e
  F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
  F src/wherecode.c 339ee802d9d311acf0cba8b5a9a092e167ef71c3a777d4b3e57de25d193251c7
- F src/whereexpr.c 837c4a74cd023553b914e244c361a92c868a8b848783f4ff2387ccd61b6ccbc9
 -F src/whereexpr.c 1aac918f82953c9b5c8bee948434cb6476af0262141002f5818842c503f8c95a
++F src/whereexpr.c 61035ab300a5e2ee37aa531cbb621bc33873631a28dcacceb9e71c3b884c4d1d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@@ -1584,7 -1583,7 +1584,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 18f0616e15684ca327fb10a1d133331af1d3b75f609498982290f6ad69fcaced
- R 956ace4d151b9d18ca3bfa0998026b83
- U dan
- Z 227909c502fe08051a0386f1253486e4
 -P 7076e8283ebae1b45a5d85d9538b49b6da399d38c3c6935de100f948f814f6a9
 -R 2588e32e458f4a139c46205abd1223cf
++P 87b381663398f029f52cb5598aadd069b03034b6f833ce80ba762b406075a44e ebcfa73e1c8ebb4fc371a6dcf77f97b6e06e405a299c66182aa4b20423d519ec
++R bb6b907fdeee773111627b13bd53e940
++T +closed ebcfa73e1c8ebb4fc371a6dcf77f97b6e06e405a299c66182aa4b20423d519ec
+ U drh
 -Z b64d9ad639f986633210dd4158608eff
++Z cfbd76746fc81ebc7a88eb549c6e1ee7
diff --cc manifest.uuid
index fd2ba71cb22d1a471128abb4bf216cf07d588cbf,117824aa6846f61a4277021987de0c50c50245a5..543f6e95873f435a7d7364bc5cf90d4b3ab62897
@@@ -1,1 -1,1 +1,1 @@@
- 87b381663398f029f52cb5598aadd069b03034b6f833ce80ba762b406075a44e
 -ebcfa73e1c8ebb4fc371a6dcf77f97b6e06e405a299c66182aa4b20423d519ec
++b82efd2a24914ace39acf99df75175042471fd73a8d31d66a40b15f63b342e10
diff --cc src/whereexpr.c
Simple merge