From 4120994fdf0b646fda4768b68dda16f0799fd0ff Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 20 Dec 2011 13:13:09 +0000 Subject: [PATCH] Assert that the isCommit parameter to sqlite3WalFrames() is zero if and only if the nTruncate parameter is zero. FossilOrigin-Name: 979daf92e09305665d943e197b93b81139197c5b --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/wal.c | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index d896acd364..e6573ae9e2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\stest\sfor\sWAL\smode\sto\sunixexcl.test. -D 2011-12-19T15:46:51.583 +C Assert\sthat\sthe\sisCommit\sparameter\sto\ssqlite3WalFrames()\sis\szero\sif\sand\nonly\sif\sthe\snTruncate\sparameter\sis\szero. +D 2011-12-20T13:13:09.326 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -250,7 +250,7 @@ F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56 F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790 F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843 F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a -F src/wal.c 89a60a8bf8daa805b819f97b2049a62ae5618707 +F src/wal.c 5525f049dffd47ee860bf4ffbb8da4ebef78637d F src/wal.h 42f8313f7aaf8913e2d1fdf7b47025c23491ea1d F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f F src/where.c af623942514571895818b9b7ae11db95ae3b3d88 @@ -984,7 +984,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P 21b76af6edd48f665cdd3af5f99d477f030c7668 -R e3e501a911a193a6cca08b5fc467fda0 -U dan -Z 8da8eb99ffcc8591296a31b08a15f7c3 +P 4d518bd4801c31bb1e4fb0329ad057e549035237 +R b6fa212f141f93e02b36860230812df1 +U drh +Z ec529eca7ddb3f43acff46ddca1c2443 diff --git a/manifest.uuid b/manifest.uuid index a8926d69a1..6ec54257b9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4d518bd4801c31bb1e4fb0329ad057e549035237 \ No newline at end of file +979daf92e09305665d943e197b93b81139197c5b \ No newline at end of file diff --git a/src/wal.c b/src/wal.c index 03c482554e..fa44b66d32 100644 --- a/src/wal.c +++ b/src/wal.c @@ -2691,6 +2691,10 @@ int sqlite3WalFrames( assert( pList ); assert( pWal->writeLock ); + /* If this frame set completes a transaction, then nTruncate>0. If + ** nTruncate==0 then this frame set does not complete the transaction. */ + assert( (isCommit!=0)==(nTruncate!=0) ); + #if defined(SQLITE_TEST) && defined(SQLITE_DEBUG) { int cnt; for(cnt=0, p=pList; p; p=p->pDirty, cnt++){} WALTRACE(("WAL%p: frame write begin. %d frames. mxFrame=%d. %s\n",