1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-05-01 08:24:53 +03:00

In sqlite_dbpage, cancel any pending truncate operation if there an error

occurs later in the transaction.

FossilOrigin-Name: 1abab10f85a4dba5ffe51a30eeef30853c120e5566ed97b3af1526fff597c647
This commit is contained in:
drh 2024-11-30 14:13:35 +00:00
parent 03e306b3a1
commit c5b9da34f2
3 changed files with 9 additions and 7 deletions

View File

@ -1,5 +1,5 @@
C A\sNEVER()\sthat\swas\sadded\sby\s[eb5ac9e5b9a4f9c8]\sis\sviolated\sby\sthe\sifnull()\nin-line\sfunction.\s\sThis\scheck-in\sfixes\sthat\sproblem.
D 2024-11-30T12:00:38.558
C In\ssqlite_dbpage,\scancel\sany\spending\struncate\soperation\sif\sthere\san\serror\noccurs\slater\sin\sthe\stransaction.
D 2024-11-30T14:13:35.669
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@ -723,7 +723,7 @@ F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d49
F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
F src/ctime.c d35723024b963edce9c0fad5b3303e8bb9266083784844baed10a6dedfe26f3b
F src/date.c 89ce1ff20512a7fa5070ba6e7dd5c171148ca7d580955795bf97c79c2456144a
F src/dbpage.c db1be8adaf1f839ad733c08baeac5c22aa912f7b535865c0c061382602081360
F src/dbpage.c 6c52074b0edb914d526c85541ca0f1fd23822b5dac39b6ee9b7f375d9fa592e9
F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
F src/expr.c cd85c48b408f67ce077155ad17b2822214b040afc2269cfcbe6510d945cc6986
@ -2201,8 +2201,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 3ec2df5a6c731b59b0ab132ee59c74d107f9c4bd32cf47d9776887858b9c0dea
R bbde09ca9109487c159b50c815e366a3
P 2220ccf4d6fea2413015c72fd318003b4b5afeae7cb7586b714fce36212d8c49
R f154a3e6dd4944fdbd4f1ae39e54884f
U drh
Z d347c790e4473436a571b458a4266fa7
Z a3278a97e32db442096a47b4ce1a54d9
# Remove this line to create a well-formed Fossil manifest.

View File

@ -1 +1 @@
2220ccf4d6fea2413015c72fd318003b4b5afeae7cb7586b714fce36212d8c49
1abab10f85a4dba5ffe51a30eeef30853c120e5566ed97b3af1526fff597c647

View File

@ -393,6 +393,8 @@ static int dbpageUpdate(
memcpy(aPage, pData, szPage);
pTab->pgnoTrunc = 0;
}
}else{
pTab->pgnoTrunc = 0;
}
sqlite3PagerUnref(pDbPage);
return rc;