From: dan <Dan Kennedy>
Date: Tue, 28 May 2024 18:35:12 +0000 (+0000)
Subject: Fix another problem with the sqlite3_log() message identifying the table or index... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=357e2fee7c1cfba5c39e4a0c118b74b998d6f859;p=thirdparty%2Fsqlite.git

Fix another problem with the sqlite3_log() message identifying the table or index that a conflicting page belongs to.

FossilOrigin-Name: d033d9435007c7753d48f019626cf22c82569f93506a7e0158a09d5c4274baae
---

diff --git a/manifest b/manifest
index 15e9536c57..31c85f8069 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.46.0\sfor\sthe\sbegin-concurrent\sbranch
-D 2024-05-23T14:04:16.818
+C Fix\sanother\sproblem\swith\sthe\ssqlite3_log()\smessage\sidentifying\sthe\stable\sor\sindex\sthat\sa\sconflicting\spage\sbelongs\sto.
+D 2024-05-28T18:35:12.968
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -698,7 +698,7 @@ F src/auth.c 19b7ccacae3dfba23fc6f1d0af68134fa216e9040e53b0681b4715445ea030b4
 F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
 F src/bitvec.c 501daeef838fa82a9fb53540d72f29e3d9172c8867f1e19f94f681e2e20b966e
 F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
-F src/btree.c 0b8013548d5595aac3d51b8ac75c722c78b3e8c3feafb0f71a60c7379577b023
+F src/btree.c 04ccc011b8a26f121b5b756863698f3afa8a8851e668c5e14edd596bb09defc6
 F src/btree.h bdeeb35614caa33526b603138f04c8d07a3f90a1300b5ade76848b755edf2027
 F src/btreeInt.h 8efd30e75e35a3c6a1c4dad7410d4ddfcd560f5f46401b208fa79eceef34525a
 F src/build.c 85ef9135eb2477f010e515411ab251d560021d5318c5316929797f28a41b70c8
@@ -1011,7 +1011,7 @@ F test/concurrent.test fb624ddac9b008f347685911f90b6b5a022fd0a3f884c0ffef8056bc4
 F test/concurrent2.test de748c7dd749c77e2af2c4b914b9b09a28ac09608042ca498c0251dc6f46aa1a
 F test/concurrent3.test 82923fc2ea7321144b4448f98ea38aa316ddceef9020a392c5f6dea536506434
 F test/concurrent4.test e0b12cd467137e50259df3b4f837507e82aaa07c35941c88664dc8ed1d089c44
-F test/concurrent5.test aeb438ead1b9bb5204fa1066e8aed0bb27e5a08e4fa9b0ad42932f96eb0f97eb
+F test/concurrent5.test 5031c87134fee85352ac33ad33c81c6ec4f07d5547fe2429e1d38492a797f6bc
 F test/concurrent6.test a7860e9ca13bb5fb76bcf41c5524fbfa9c37e6e258ecf84ffb5748a272488c67
 F test/concurrent7.test b96fa5c4cfdf8d5c0bc66b6934214500bad0260884a736f054ccc76e81aae85d
 F test/concurrent8.test b93937e74a8efb8b84f2fea7595b53418c5f29777bbe9cbdb5dc219b3dd72a7d
@@ -2208,8 +2208,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5c1c8651d122f811dfc3dd08007214c1b38e1229b13b3a8a50a8753ef3767988 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e
-R f152d60ac37c304e2bd46e9eaa53f64c
-U drh
-Z 61453f6fd00e6956b8e3793ef1f1418c
+P e3f8c70ef5a7349c0ebcb807b3ec4ad1f228f8afce1122889571fbf7471e68e4
+R 229670c901bbf6a4c3d75a925040c458
+U dan
+Z f36f73d17448085f936001613ea9eba1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ea350f37d1..295c1733c9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e3f8c70ef5a7349c0ebcb807b3ec4ad1f228f8afce1122889571fbf7471e68e4
\ No newline at end of file
+d033d9435007c7753d48f019626cf22c82569f93506a7e0158a09d5c4274baae
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 3bfccdc2e1..4a120ebb36 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -10153,6 +10153,9 @@ int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64 iKey){
           pPageIn = 0;
           rc = sqlite3PagerGet(pSrcPager, ovflIn, &pPageIn, PAGER_GET_READONLY);
           if( rc==SQLITE_OK ){
+            setMempageRoot(
+                (MemPage*)sqlite3PagerGetExtra(pPageIn), pSrc->pgnoRoot
+            );
             aIn = (const u8*)sqlite3PagerGetData(pPageIn);
             ovflIn = get4byte(aIn);
             aIn += 4;
diff --git a/test/concurrent5.test b/test/concurrent5.test
index 4afd06bcaf..21dc0cc2dd 100644
--- a/test/concurrent5.test
+++ b/test/concurrent5.test
@@ -238,6 +238,36 @@ do_catchsql_test 1.7.4 {
   COMMIT;
 } {1 {database is locked}}
 
+#-------------------------------------------------------------------------
+reset_db
+sqlite3 db2 test.db
+
+set big1 "[string repeat ab 10000]"
+set big2 "[string repeat ab  9999]xy"
+do_execsql_test 2.0 {
+  PRAGMA journal_mode = wal;
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b TEXT);
+  CREATE TABLE t2(a INTEGER PRIMARY KEY, b TEXT);
+  INSERT INTO t1 VALUES(100, $big1);
+} {wal}
+
+do_execsql_test -db db2 2.1 {
+  BEGIN CONCURRENT;
+    INSERT INTO t2 SELECT * FROM t1;
+}
+
+do_execsql_test 2.2 {
+   UPDATE t1 SET b=$big2
+}
+
+do_test 2.3 {
+  list [catch { db2 eval COMMIT } msg] $msg
+} {1 {database is locked}}
+
+do_test_conflict_msg 2.4 {
+  conflict at page 22 (read-only page; part of db table t1; content=0000000061626162...)
+}
+
 db close
 db2 close
 sqlite3_shutdown
@@ -245,3 +275,4 @@ test_sqlite3_log
 sqlite3_initialize
 finish_test
 
+