From: dan <Dan Kennedy>
Date: Fri, 16 Feb 2024 11:03:07 +0000 (+0000)
Subject: Fix a problem with the sqlite3_log() message identifying the table or index that... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d23e88a992f37150d4bc7414c0ab06df2163270;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: d6c629f1655a207a511444680c3e89089b4e9ee30a699f396549324d5c4a238e
---

diff --git a/manifest b/manifest
index 80beb43123..48c9933f8f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
-D 2024-01-13T19:57:37.125
+C Fix\sa\sproblem\swith\sthe\ssqlite3_log()\smessage\sidentifying\sthe\stable\sor\sindex\sthat\sa\sconflicting\spage\sbelongs\sto.
+D 2024-02-16T11:03:07.832
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -681,7 +681,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 6a4a14ab7e1fa00ee08234c749aaef78eeb7baff2806f9f7c0352f83ad10dea2
+F src/btree.c d21f48258071dd96f854036a84a45ddef05985b0d11ae0e032dbb2667aea2f87
 F src/btree.h d906e4d53f483c83d471d99479fa73fcdf20696305d578876f46ee283f3507cb
 F src/btreeInt.h 57551d7c9830dd7f2d2b3fb73e6ec90aefd98a18b15e565c86ff1a9bb1639273
 F src/build.c 9c04ebb789ae19a7d94cd0a1ba8dcea041c2cd0d88157a2cd9cd8ecf40d3bf7f
@@ -992,7 +992,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 0c16cbf7446af162a14e6def30445e94016064eb994e5aa4ebb2bebc59554176
+F test/concurrent5.test 6088092b0cebe6ff299d781b06c9b4d44c91d7c8f8023f6abb9bffdb436c01b3
 F test/concurrent6.test a7860e9ca13bb5fb76bcf41c5524fbfa9c37e6e258ecf84ffb5748a272488c67
 F test/concurrent7.test b96fa5c4cfdf8d5c0bc66b6934214500bad0260884a736f054ccc76e81aae85d
 F test/concurrent8.test b93937e74a8efb8b84f2fea7595b53418c5f29777bbe9cbdb5dc219b3dd72a7d
@@ -1350,7 +1350,7 @@ F test/json/README.md de59d5ba0bd2796d797115688630a6405bbf43a2891bad445ac6b9f38b
 F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd28656fb261bddc8a3f
 F test/json/json-q1.txt 65f9d1cdcc4cffa9823fb73ed936aae5658700cd001fde448f68bfb91c807307
 F test/json/json-speed-check.sh 912ee03e700a65c827ee0c7b4752c21ec5ef69cf7679d2f482ca817042bead52 x
-F test/json/jsonb-q1.txt 1e180fe6491efab307e318b22879e3a736ac9a96539bbde7911a13ee5b33abc7 w test/json/json-q1-b.txt
+F test/json/jsonb-q1.txt 1e180fe6491efab307e318b22879e3a736ac9a96539bbde7911a13ee5b33abc7
 F test/json101.test 70587d7d35ef9e2126364ba70f0c951f70827cfbd28649d779ff3df7e8f87547
 F test/json102.test 557a46e16df1aa9bdbc4076a71a45814ea0e7503d6621d87d42a8c04cbc2b0ef
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
@@ -2174,8 +2174,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 c407d3bb9979933d7f5418ac2baa238b1f13c1aa769bf452c5c33088fdb1e959 f47a5f4e0ce078e6cc1183e6cbb3c4013af379b496efae94863a42e5c39928ed
-R fe5d97e053c47e908fb628066364d0e3
+P 95bf4bc2e2cc1e7489d82c68deb68feefbdc34fec1baeb9bb8a92ff1063b806c
+R 5622791fb87201582217f7c3311b2f02
 U dan
-Z 5ed26b44c3c06bbcd8306ad8e3790a13
+Z e700c0c0f07d1a444f26268ef99169ac
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ba5c502509..152d8e9294 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-95bf4bc2e2cc1e7489d82c68deb68feefbdc34fec1baeb9bb8a92ff1063b806c
\ No newline at end of file
+d6c629f1655a207a511444680c3e89089b4e9ee30a699f396549324d5c4a238e
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 4644fcddaa..bbb5c7b52a 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -6557,6 +6557,7 @@ bypass_moveto_root:
       pCur->pPage = pCur->apPage[--pCur->iPage];
       break;
     }
+    setMempageRoot(pCur->pPage, pCur->pgnoRoot);
     /*
     ***** End of in-lined moveToChild() call */
  }
diff --git a/test/concurrent5.test b/test/concurrent5.test
index bc00232442..088e4fff38 100644
--- a/test/concurrent5.test
+++ b/test/concurrent5.test
@@ -124,6 +124,37 @@ do_test_conflict_msg 1.3.2 {
   conflict at page 211 (read/write page; part of db index t3.i3; content=0A0310006300D800...)
 }
 
+db2 close
+reset_db
+do_execsql_test 1.5.0 {
+  PRAGMA auto_vacuum = 0;
+  PRAGMA journal_mode = wal;
+  CREATE TABLE t1(a, b);
+  CREATE INDEX i1 ON t1(a, b);
+  WITH s(i) AS (
+    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<1000
+  ) 
+  INSERT INTO t1 SELECT i, randomblob(200) FROM s;
+} {wal}
+do_test 1.5.1 {
+  set ::log [list]
+
+  execsql {
+    BEGIN CONCURRENT;
+      INSERT INTO t1 VALUES(100000, '');
+  } db
+
+  sqlite3 db2 test.db
+  execsql { INSERT INTO t1(rowid, a, b) VALUES(-1, 100001, '') } db2
+  catchsql COMMIT db
+} {1 {database is locked}}
+
+do_test_conflict_msg 1.5.2 {
+  conflict at page 507 (read/write page; part of db index t1.i1; content=0A00000003025000...)
+}
+
+sqlite3 db2 test.db
+
 db close
 db2 close
 sqlite3_shutdown