From: drh <> Date: Mon, 9 Aug 2021 13:06:59 +0000 (+0000) Subject: Fix comments associated with sqlite3.eOpenState. No logic changes. X-Git-Tag: version-3.37.0~290 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=687d74dfcc688f5e2d4b4f28ca48953a13c8903f;p=thirdparty%2Fsqlite.git Fix comments associated with sqlite3.eOpenState. No logic changes. FossilOrigin-Name: fd8f498f5d5f7fcb78dd8f6f9323d20b9e2904b249ec735477a0f03cb47b8561 --- diff --git a/manifest b/manifest index 596fd1d686..b2275510b3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Refactor\ssqlite3.magic\sinto\ssqlite3.eOpenState. -D 2021-08-07T23:16:52.446 +C Fix\scomments\sassociated\swith\ssqlite3.eOpenState.\s\sNo\slogic\schanges. +D 2021-08-09T13:06:59.509 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -549,7 +549,7 @@ F src/shell.c.in 24b99dae8818d1a234732d73f4d5b49f12b510bc62735a41c04e314fafae09e F src/sqlite.h.in 43fcf0fe2af04081f420a906fc020bde1243851ba44b0aa567a27f94bf8c3145 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510 -F src/sqliteInt.h 7406ab363796bfc5b3e91924dc4086a9daf3e5f427db923d0d952765e5136ec5 +F src/sqliteInt.h 9a0fa72633b685bd391f683143755a17549a7ac6ef22c23e5d1cd6ea1097f384 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657 F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -620,7 +620,7 @@ F src/vdbe.c b73a5ec9940185eb001ff8cff2cfd429bb438c7e89f2885e0bfdb56c3ff13386 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe F src/vdbeInt.h 38206c8dd6b60ff03d9fd4f626b1b4fd0eef7cdc44f2fc2c1973b0f932a3f26b F src/vdbeapi.c aa5aaf2c37676b83af5724c6cd8207a3064ed46a217fd180957f75ac84f7a2a5 -F src/vdbeaux.c 202dbaf7d1570cd53678f6b0bcad7b0642e88bc5d77abc1d5b8b9a202a6a19fd +F src/vdbeaux.c 2368a8888f17368d4040a05966f7d2a2276cac4eeeba50793828186d999e3c8f F src/vdbeblob.c 60a7694760e35b2bba166cf49eb6a1eb0b31581102b49de78008ca3032406065 F src/vdbemem.c 53881aa0a7845922a075b3f375695588618098871a7a4120af4c297b80fa3e64 F src/vdbesort.c cd5130f683706c1a43e165a74187745fb3351cb56052cf9dc91de820634bbde2 @@ -1920,7 +1920,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 087b8b41c6ed76b55c11315e7e95679d67590be20ae21108b593d00bb7d1c57a -R 56f3f3302aa9f24a162fee58d25cbe2b +P e5d6512aa1fa0016a679c6e0cb665a0c67ad16f1daa0c18a96b2ebae1beefd15 +R 43c2a7d0dc9629f135a1e60c0a2a89c6 U drh -Z 8ec916b30c9fee315b610a0f44e54d61 +Z bcb0948652933ffc3bff48e453c11acf diff --git a/manifest.uuid b/manifest.uuid index 5013496d8d..22fc897873 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e5d6512aa1fa0016a679c6e0cb665a0c67ad16f1daa0c18a96b2ebae1beefd15 \ No newline at end of file +fd8f498f5d5f7fcb78dd8f6f9323d20b9e2904b249ec735477a0f03cb47b8561 \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index b2d09ff0aa..cc31acdbaf 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1762,7 +1762,7 @@ struct sqlite3 { #define ConstFactorOk(P) ((P)->okConstFactor) /* -** Possible values for the sqlite.eOpenState field. +** Possible values for the sqlite3.eOpenState field. ** The numbers are obtained at random and have no special meaning, other ** than being distinct from one another. */ diff --git a/src/vdbeaux.c b/src/vdbeaux.c index a6bb915e1c..c04bd0d379 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -3005,9 +3005,9 @@ int sqlite3VdbeCheckFk(Vdbe *p, int deferred){ ** has made changes and is in autocommit mode, then commit those ** changes. If a rollback is needed, then do the rollback. ** -** This routine is the only way to move the state of a VM from -** SQLITE_MAGIC_RUN to SQLITE_MAGIC_HALT. It is harmless to -** call this on a VM that is in the SQLITE_MAGIC_HALT state. +** This routine is the only way to move the sqlite3eOpenState of a VM from +** SQLITE_STATE_RUN to SQLITE_STATE_HALT. It is harmless to +** call this on a VM that is in the SQLITE_STATE_HALT state. ** ** Return an error code. If the commit could not complete because of ** lock contention, return SQLITE_BUSY. If SQLITE_BUSY is returned, it