From: shearer Date: Fri, 25 Sep 2020 17:17:24 +0000 (+0000) Subject: Clarify X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f36cbefe811c769ba39c95fda7b60c6124db7f9d;p=thirdparty%2Fsqlite.git Clarify FossilOrigin-Name: 14dba0f3b5defef148c78e7613fc33044598008df4dee834f752bd10891e3684 --- diff --git a/manifest b/manifest index 604dbfdc89..f2cedda500 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ B 3d35fa0be866213274fc09250225b345f6b08a9b4ec373d53d95e627e24512be -C Distinguish\sbetween\scheckpoints\s(WAL-only,\simplementation\sspecific)\sand\s\nsavepoints\s(Btree\sinternal\simplementation\sof\sCOMMIT/ROLLBACK\ssubtransactions)\s\nand\sSQL\sSAVEPOINT\s(identical\sname\sfor\sSQL-level\ssubtransactions) -D 2020-09-25T16:54:55.839 +C Clarify +D 2020-09-25T17:17:24.789 F ext/expert/expert1.test dba6e752cc701621771f925f3872b183fa688f7b4a9f4822631fc02bdbffc45a F ext/expert/sqlite3expert.c 2778d9f06b3a8bfa859cb6b75b82f004477bf5dd78edd17d954319750ca963f3 F ext/fts5/fts5Int.h ba835c165bb87650fc806008969799a7a1fbe3e221fd5a850dd044eb6a87b243 @@ -13,7 +13,7 @@ F ext/fts5/test/fts5hash.test dc7bc7e0cdeb42cfce31294ad2f8fcf43192bfd0145bb7f3ec F ext/fts5/test/fts5integrity.test e387b2bd1c83e50f4a12f58a5fd399111bbab36be2f1c9fd5bb974be08a32de6 F ext/rtree/rtree.c 60f6f1675134201974be4189dbd219494c13e1ed30e80bd92ae0dcc86df1b035 F src/btree.c fb7970654479f968ab09321f6a6c8b796174860b641f7d8879f221dd6667e272 -F src/btree.h c7fc07ab80a5ab90b0390715844965d63cc4fe6c860ab740f0383d9cef56ae55 +F src/btree.h c17600e1cfe04d60b154b4f82ad0cfbb4ebe618fdc07a897d53d8ff7d8bf25f8 F src/pragma.c 6daaaecc26a4b09481d21722525b079ce756751a43a79cc1d8f122d686806193 F src/select.c 6c3f7d60295f06ce7fa128bb23b1159648f0aa96a78c257af35dfef727ac63f1 F src/sqlite.h.in cb9f0862e8d0f8691de95b18439ab60666f868c83bc65e3a17f0a0b44cc8f8a9 @@ -22,7 +22,7 @@ F src/wherecode.c 9afd600ca9fe831f342121cca48ad8839c8a18ca4e0372518a0a3c8123a8f0 F test/with1.test 323659eaf309787add657d05e5943e437a7a3494f2b6602a0deb18fdebc1ab4c F tool/lemon.c 70eedc31614a58fe31a71025c17ebd1502a6ce9cfef0ed5e33acb0b5b737b291 F tool/lempar.c 0e1d5eeb9736108d3dba782a9dd56f4e7cb69006b6ee181308b7ebfb15313a12 -P a4840cf5c682a22f32eb1890fc4ecc35a367d967142b284e5993c7faf512d71e -R 2c433bcd7399575f9d5fbf6f659701f4 +P ae686ab6a84ad19fec5873034e873b3d8d933a792b9742626627fa0677002a08 +R ee18560bf2c2584dcd88d472e7ecea96 U shearer -Z 9131b8e126bb25cdee7fb1f0672e4c25 +Z 6cd8fd04d396501bd5c6c02740ad74f7 diff --git a/manifest.uuid b/manifest.uuid index 982d27e045..df67442917 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ae686ab6a84ad19fec5873034e873b3d8d933a792b9742626627fa0677002a08 \ No newline at end of file +14dba0f3b5defef148c78e7613fc33044598008df4dee834f752bd10891e3684 \ No newline at end of file diff --git a/src/btree.h b/src/btree.h index d9714fa2bc..5056b489f4 100644 --- a/src/btree.h +++ b/src/btree.h @@ -173,7 +173,7 @@ int sqlite3BtreeCreateTable(Btree*, Pgno*, int flags); int sqlite3BtreeTxnState(Btree*); int sqlite3BtreeIsInBackup(Btree*); -/* A savepoint refers to transactions implemented with or without WAL. */ +/* A savepoint refers to transactions implemented regardless of WAL. */ /* References to 'savepoint' in btree.c relate to protected subtransactions */ /* within the Btree, which relate to SQL COMMIT/ROLLBACK in general */ /* including the SQL-level SAVEPOINT statement. */