From: drh <>
Date: Wed, 20 Nov 2024 20:24:28 +0000 (+0000)
Subject: Merge the latest trunk fixes and makefile enhancements into the commit-and-continue... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f152d579444ef9dec189aa3827db877178f5ced;p=thirdparty%2Fsqlite.git

Merge the latest trunk fixes and makefile enhancements into the commit-and-continue branch.

FossilOrigin-Name: 34cb6029cc79955b4e4790af2647d6db428b38757470f6990d8f8d8ed4979d8f
---

5f152d579444ef9dec189aa3827db877178f5ced
diff --cc manifest
index f18fbd230f,fc192ad2f9..fef1370c83
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Disable\scommit-and-continue\stests\sunder\sthe\sinmemory-journal\sand\sjournaltest\npermutations.
- D 2024-11-18T14:54:34.482
 -C New\sconfiguration\soption\s--dynlink-tools\scauses\ssome\scommand-line\stools\slike\nsqldiff\sand\ssqlite3_analyzer\sto\slink\sagainst\sthe\slibsqlite3.so\ssystem\slibrary\nrather\sthan\sbeing\sbuilt-in.\s\sCaution:\s\ssqlite3_analyzer\srequires\sthe\nSQLITE_ENABLE_DBSTAT_VTAB\scompile-time\soption\son\sits\sSQLite\slibrary\sin\sorder\nto\swork,\sso\sdo\snot\suse\s--dynlink-tools\sto\sbuild\ssqlite3_analyzer\swithout\sit.
 -D 2024-11-20T16:21:34.531
++C Merge\sthe\slatest\strunk\sfixes\sand\smakefile\senhancements\sinto\sthe\scommit-and-continue\sbranch.
++D 2024-11-20T20:24:28.728
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -761,9 -761,9 +761,9 @@@ F src/os_setup.h 6011ad7af5db4e05155f38
  F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6
  F src/os_win.c db4baa8f62bbfe3967c71b008cea31a8f2ff337c1667ff4d8a677e697315ff0d
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9
 -F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
 -F src/parse.y dcf45a81b61223ac93e61fdfe9b22d635dd371c446e8222634d90aa37e25e5f6
 +F src/pager.c d29770208271df2adbd96bc5d353aba74f84bbd79926734e9d4d4a081556439a
 +F src/pager.h 4637ae0c299215d7ed3b54e379123b518e101c0453faa2d0f7db29cb23525cee
- F src/parse.y dde57604943e3b4021ba606b0ab73a4dba9d8ab466c0208a7cdf461a84511a11
++F src/parse.y 2b2b7a96e46dff37b85b0476cc2f6c58e61f0ba007928c4121ac726adcae497b
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@@ -855,12 -855,12 +855,12 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
  F src/vtab.c 316cd48e9320660db3047cd306cd056e4361180cebb4d0f10a39244e10c11422
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 8b7e309a8012659ac9275ad8cdcc6acaf73fa04b1090e38a01335f230fd10681
 -F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 +F src/wal.c bb1c95e275548f7254ed73113d765bfdfb7975c836793d64a73770c096c5c86f
 +F src/wal.h a1ec57934aa26c23805e00ddbc0cd5da5760028d3608d882647345de2e330a3e
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c 4de9e7ca5f49e4a21c1d733e2b2fbbc8b62b1a157a58a562c569da84cfcb005b
+ F src/where.c 504d72098437ab97dfd3a71cea85e554381650f9dffde277c66603f3e34daddc
  F src/whereInt.h 1e36ec50392f7cc3d93d1152d4338064cd522b87156a0739388b7e273735f0ca
- F src/wherecode.c 81b9af89f4f85c8097d0da6a31499f015eabc4d3584963d30ba7b7b782e26514
+ F src/wherecode.c 0c3d3199a2b769a5e2bb70feb5003dc85b3d86842ecaf903a47f2b4205ca5dab
  F src/whereexpr.c 0f93a29cabd3a338d09a1f5c6770620a1ac51ec1157f3229502a7e7767c60b6f
  F src/window.c 6c386af5972a58f9a9847bba9d7ca70c4c682391ab8478d94a6e046b22a0dbb3
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@@ -2199,8 -2199,9 +2200,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P a2b784cb876f8c7e5b713a5ae5b7c8072e40d1fb48837bff085683bf1b71c68f
- R 5230c5723d4fcd622b703101347c3177
 -P 19d1bede5654bcfa9f7a151b9b2616a3d10873b8e3f8cf54a3a7e810da08f844 bfaa3ee7588b6f6be9799882c6ed6472357d988fac31512d5e92fe28f57029c6
 -R 4149ca832938d8cc469625636a536cf9
 -T +closed bfaa3ee7588b6f6be9799882c6ed6472357d988fac31512d5e92fe28f57029c6
++P 2f31c2b0a14e278c4bdb3ab19811b9a3cdfeb788e4fb2308408d9d11a11a7313 314c606dd36e03d2ded899c536585ea21250af56b553fa4c96dc714cb5099522
++R 025d7df3a727dfa44b8b785c6ba258a5
  U drh
- Z 12f71d9e3f5ceacb3f1229ebf41d8558
 -Z 353d2b1e26c72a6c71622b8679ecfa79
++Z 7e57de85f4bd50f0de71f40db6f82a7b
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 3232ad8181,8022a04f68..c7aea9f316
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2f31c2b0a14e278c4bdb3ab19811b9a3cdfeb788e4fb2308408d9d11a11a7313
 -314c606dd36e03d2ded899c536585ea21250af56b553fa4c96dc714cb5099522
++34cb6029cc79955b4e4790af2647d6db428b38757470f6990d8f8d8ed4979d8f
diff --cc src/parse.y
index 524418d162,b8d904d12c..dce7918350
--- a/src/parse.y
+++ b/src/parse.y
@@@ -481,18 -481,6 +483,18 @@@ resolvetype(A) ::= raisetype(A)
  resolvetype(A) ::= IGNORE.                   {A = OE_Ignore;}
  resolvetype(A) ::= REPLACE.                  {A = OE_Replace;}
  
 +////////////////////////// COMMIT AND CONTINUE TRANSACTION ////////////////////
 +//
 +cmd ::= COMMIT(X) AND(A) ID(Y) TRANSACTION. {
 +  if( (pParse->db->flags & SQLITE_OkContTrans)==0 ){
-     sqlite3ReportSyntaxError(pParse, &A);
++    parserSyntaxError(pParse, &A);
 +  }
 +  if( Y.n!=8  || sqlite3_strnicmp(Y.z,"continue",8)!=0 ){
-     sqlite3ReportSyntaxError(pParse, &Y);
++    parserSyntaxError(pParse, &Y);
 +  }
 +  sqlite3EndTransaction(pParse, @X, 1);
 +}
 +
  ////////////////////////// The DROP TABLE /////////////////////////////////////
  //
  cmd ::= DROP TABLE ifexists(E) fullname(X). {