From: drh <>
Date: Wed, 31 Jul 2024 22:36:14 +0000 (+0000)
Subject: Fix the tclsqlite.c TCL interface module so that it works with both Tcl8 and
X-Git-Tag: version-3.47.0~273
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1291e79d3d0c8b6aa40b455151b988a92879e17;p=thirdparty%2Fsqlite.git

Fix the tclsqlite.c TCL interface module so that it works with both Tcl8 and
Tcl9.  Make changes across the TCL-based test harness to enable SQLite to
be tested with either Tcl8 or Tcl9.  Get the --with-tcl= argument on the
configure script working. Testing changes only - no changes to the SQLite core.
I believe the previous merge attempt didn't work because of errors in the
merge itself, not because of faults in the code.  Trying again...

FossilOrigin-Name: ea9d88f9ca3399bca83bf03893689a927b73e481604b94527e42de43f103eb46
---

a1291e79d3d0c8b6aa40b455151b988a92879e17
diff --cc manifest
index 3fab5b62af,282a025c06..ce082dd8f3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sdocumentation\stypo.\s\n[forum:/forumpost/993cb82402|Forum\spost\s993cb82402]
- D 2024-07-27T20:28:13.014
 -C testrunner.db\sshould\sbe\sin\sWAL\smode\sfor\simproved\sconcurrency\swhile\srunning\n"watch\ssqlite3\stest/testrunner.tcl\sstatus".
 -D 2024-07-31T22:26:04.028
++C Fix\sthe\stclsqlite.c\sTCL\sinterface\smodule\sso\sthat\sit\sworks\swith\sboth\sTcl8\sand\nTcl9.\s\sMake\schanges\sacross\sthe\sTCL-based\stest\sharness\sto\senable\sSQLite\sto\nbe\stested\swith\seither\sTcl8\sor\sTcl9.\s\sGet\sthe\s--with-tcl=\sargument\son\sthe\nconfigure\sscript\sworking.\sTesting\schanges\sonly\s-\sno\schanges\sto\sthe\sSQLite\score.\nI\sbelieve\sthe\sprevious\smerge\sattempt\sdidn't\swork\sbecause\sof\serrors\sin\sthe\nmerge\sitself,\snot\sbecause\sof\sfaults\sin\sthe\scode.\s\sTrying\sagain...
++D 2024-07-31T22:36:14.186
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2199,8 -2200,8 +2200,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P eb64d106551718467e0f6c6b53695410bf4c566901008e4cda8580d0f7efa7b0
- R ad51bbdd14781776f7624246eec357e7
 -P 2afadbeb124d6d7bb81d473379269014ebd8601f98f231e2218f54350a2e5fd3
++P 86de4e755e37dc1cbcbd59018927aa87ff49fc15f706a36187631d8f14075c12 f23ad0979865f3c11a3dbd0598ee7c4e2eabeaf1863d000fc0242e18890a4a11
+ R 5fce834a5a2db65fecaa00b46e4798f7
  U drh
- Z 102d909571cd81f9b00d601f888788db
 -Z 15b14d3b91c5abdab729b01ed2691ec8
++Z 9ec5dbf6df6049abe121ce7ac9b8445b
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index da015916e3,ddddcb7d72..05b9c5c202
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 86de4e755e37dc1cbcbd59018927aa87ff49fc15f706a36187631d8f14075c12
 -f23ad0979865f3c11a3dbd0598ee7c4e2eabeaf1863d000fc0242e18890a4a11
++ea9d88f9ca3399bca83bf03893689a927b73e481604b94527e42de43f103eb46