From: dan Date: Wed, 24 Jun 2026 13:37:31 +0000 (+0000) Subject: Remove a stray C++ style comment left in build.c by the previous commit on this branch. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0a79d844716f8cfa8f1462058134fc5cc20ab3c;p=thirdparty%2Fsqlite.git Remove a stray C++ style comment left in build.c by the previous commit on this branch. FossilOrigin-Name: bfce01a4b06b5f3bfb050bf15e25919a6c85b3ec0002acd016ac8c5ffa500daf --- diff --git a/manifest b/manifest index 9cf33c6e2c..09cd2662eb 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Revert\sthe\sfixes\sto\sbackup\sin\s[1f940357f7]\sand\s[e5db80350c]\sand\sinstead\sfix\sthe\sproblem\sreported\sby\sforum\spost\s[forum:15d82885e2\s|\s15d82885e2]\s(that\sa\scall\sto\ssqlite3_deserialize()\safter\ssqlite3_backup_init()\sbut\sbefore\sthe\sfirst\scall\sto\ssqlite3_backup_step()\son\sthe\sdestination\sdb\sof\sa\sbackup\scould\scause\sa\scrash)\sby\sdeferring\scaching\sthe\spointer\sto\sthe\sdestination\sBtree\suntil\safter\sit\sis\slocked.\sThis\saddresses\sbug\s[bugs:/info/2026-06-24T08:41:13Z\s|\s2026-06-24T08:41:13Z]. -D 2026-06-24T11:50:08.765 +C Remove\sa\sstray\sC++\sstyle\scomment\sleft\sin\sbuild.c\sby\sthe\sprevious\scommit\son\sthis\sbranch. +D 2026-06-24T13:37:31.472 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -680,7 +680,7 @@ F src/btmutex.c 30dada73a819a1ef5b7583786370dce1842e12e1ad941e4d05ac29695528daea F src/btree.c 515cf62220ceb483ba9a31ebb3d7565ea9d63ffc3d61bb974b2815fef393df0e F src/btree.h 2ee0ddfdf4f8530ad1d46afffd7da21a0e243bfab10973011ac6f6b7fb4109a1 F src/btreeInt.h 4f512ad31083216b6789762d4c345b73367985d3b39421c9ba7c0902d09fb38b -F src/build.c 0a06d413b17a5d7ff80a8499c413e7e3e50cd96f161c4d400462cb8416698c06 +F src/build.c 09946336c3011c2ae2faccdf04e33336e1cd51fd836651be0cd7eb5814f7f6a0 F src/callback.c 3605bbf02bd7ed46c79cd48346db4a32fc51d67624400539c0532f4eead804ad F src/carray.c 3efe3982d5fb323334c29328a4e189ccaef6b95612a6084ad5fa124fd5db1179 F src/complete.c f216b970ce99c5a657556cf1f17e7ddd494515d3beb63df426bf59ff43bd3d9a @@ -2208,11 +2208,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 23936786e680131af644510eb50b7ad20ee39221d1fb29732dea76483aed2273 -R e0e0f7b38815f812e27f687f577ea44f -T *branch * attach-backup-fix -T *sym-attach-backup-fix * -T -sym-trunk * +P 44a0f396daa13f382fd839cd8be49148aa24114968b97fed7f365307d1f8280a +R d777b3a711fbb366f126d9ec3b82578b U dan -Z df2c9c70dcdd169082f93f43b6437c36 +Z 07132fb0ea7f4f6c60830c685b41d37c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b60937e3a0..9989957a40 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -44a0f396daa13f382fd839cd8be49148aa24114968b97fed7f365307d1f8280a +bfce01a4b06b5f3bfb050bf15e25919a6c85b3ec0002acd016ac8c5ffa500daf diff --git a/src/build.c b/src/build.c index 43b8be8683..7c6b818dba 100644 --- a/src/build.c +++ b/src/build.c @@ -608,7 +608,6 @@ void sqlite3CollapseDatabaseArray(sqlite3 *db){ } if( jaDb[j] = db->aDb[i]; -// sqlite3BackupUpdateSrc(db, j); } j++; }