From 749e4a9fd13d4ae4192aa42ae6ddf0ef3eb4b35e Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 14 Jul 2017 19:47:32 +0000 Subject: [PATCH] Identify requirements text in the SQLITE_DBCONFIG_ENABLE_QPSG documentation. Add some implementation marks for SQLITE_DBCONFIG_MAINDBNAME requirements. No code changes. FossilOrigin-Name: ab165dcf35ae7385c9366853ce5648294bf5dc9aa9ffe1af84243e6fac3472fc --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/main.c | 2 ++ src/sqlite.h.in | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index b74466039f..c34bbb749e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\srequirements\smarks\sfor\ssome\sof\sthe\snew\sfeatures\sin\sthe\s3.20\srelease. -D 2017-07-14T19:22:08.974 +C Identify\srequirements\stext\sin\sthe\sSQLITE_DBCONFIG_ENABLE_QPSG\sdocumentation.\nAdd\ssome\simplementation\smarks\sfor\sSQLITE_DBCONFIG_MAINDBNAME\srequirements.\nNo\scode\schanges. +D 2017-07-14T19:47:32.671 F Makefile.in eda8bedf08c4c93e2137ef1218b3d3302488c68c2774918de0335a1133aab157 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba @@ -416,7 +416,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c bb70abf32c7c926745eb550938db9132309584a667a44c2db0e5fa3207600391 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e F src/loadext.c 20865b183bb8a3723d59cf1efffc3c50217eb452c1021d077b908c94da26b0b2 -F src/main.c 20574bb9a0d7911efcd659ac252f2126dc4e3308bed3c8764ea3fb5a00f70420 +F src/main.c 3a9da9e3974d8a32ef6ca15b75503d540af22d284beb75bc7f0d93254ca3f8f7 F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de @@ -454,7 +454,7 @@ F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/select.c 95659b7990e390f9bd8dc30b8975c675fcd1d46e569bc4f5a14e22a8d03e3d14 F src/shell.c e89ad1135cb47c95896a1aec4bd0113af90a057d80f20003f354fa56fc10a616 F src/shell.c.in dae43a6a43988d955014f070341f296561ea4a43ca2685166a32495b0667ef59 -F src/sqlite.h.in 8f028c7f751e628535b2f47889d9a16a4e02ee804e2ce08c12d8be021db7bb27 +F src/sqlite.h.in 753bffec79261978670e8a29f52548b5c211ec003dc9d2a383cbb73d4f6a11b2 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 654d76dd288780a460be9c88edc6a5eb2d61df03a7153c92f1d87aba41f73b96 F src/sqliteInt.h 0ba730cdc8afa723a5642380712f8bb33abd6a69218571c18b94acf3562de22a @@ -1633,7 +1633,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 394c6f4f4376bc3d7796ea4157ba2ae230b0ca950774eff127ae6ef8a7b08602 -R 9a10092385bb5550deb258f9f1bb1913 +P 264238671379306b14d62a6ddaefd2a20acd34ca77276b6ce872253160fe0146 +R 699d2969de21ff7175916298b86255b3 U drh -Z d4da94f8403e0d025b1a3aa613ff85cd +Z f6314232ead8314cf0533ccdafdadd4c diff --git a/manifest.uuid b/manifest.uuid index 221afdfca7..86ee34822e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -264238671379306b14d62a6ddaefd2a20acd34ca77276b6ce872253160fe0146 \ No newline at end of file +ab165dcf35ae7385c9366853ce5648294bf5dc9aa9ffe1af84243e6fac3472fc \ No newline at end of file diff --git a/src/main.c b/src/main.c index f437645192..747c25ea8d 100644 --- a/src/main.c +++ b/src/main.c @@ -793,6 +793,8 @@ int sqlite3_db_config(sqlite3 *db, int op, ...){ va_start(ap, op); switch( op ){ case SQLITE_DBCONFIG_MAINDBNAME: { + /* IMP: R-06824-28531 */ + /* IMP: R-36257-52125 */ db->aDb[0].zDbSName = va_arg(ap,char*); rc = SQLITE_OK; break; diff --git a/src/sqlite.h.in b/src/sqlite.h.in index be04c162b9..7cf974dc4c 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2008,10 +2008,10 @@ struct sqlite3_mem_methods { ** ** **
SQLITE_DBCONFIG_ENABLE_QPSG
-**
The SQLITE_DBCONFIG_ENABLE_QPSG option activates or deactivates +**
^(The SQLITE_DBCONFIG_ENABLE_QPSG option activates or deactivates ** the [query planner stability guarantee] (QPSG). When the QPSG is active, ** a single SQL query statement will always use the same algorithm regardless -** of values of [bound parameters]. The QPSG disables some query optimizations +** of values of [bound parameters].)^ The QPSG disables some query optimizations ** that look at the values of bound parameters, which can make some queries ** slower. But the QPSG has the advantage of more predictable behavior. With ** the QPSG active, SQLite will always use the same query plan in the field as