From: dan Date: Mon, 27 Jun 2011 19:12:57 +0000 (+0000) Subject: Remove an unnecessary assignment from vdbeapi.c. X-Git-Tag: version-3.7.8~38^2~35^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2af0b7e0f455cadf7c222084da670d50b7526201;p=thirdparty%2Fsqlite.git Remove an unnecessary assignment from vdbeapi.c. FossilOrigin-Name: 25e5b7686a06e7f4ee993d8559d23143e2e8c7a8 --- diff --git a/manifest b/manifest index c54d53e491..ed26c9da13 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Changes\sto\simprove\sthe\sselection\sof\sdeferred\stokens\swithin\sphrases. -D 2011-06-27T11:15:53.752 +C Remove\san\sunnecessary\sassignment\sfrom\svdbeapi.c. +D 2011-06-27T19:12:57.742 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -241,7 +241,7 @@ F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e F src/vdbe.c 50b5b4ef29d928a4f60905f820ee1ab2f8ced29f F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1 F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45 -F src/vdbeapi.c 2f908c65337b16c6249ab378d477e74492cf759b +F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98 F src/vdbeaux.c 0b2e2880f13af400a27c92a7673287c3eaec8b21 F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3 F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b @@ -949,7 +949,7 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P 8230d83120e0f4d217fde56e22c6f05aa5adee09 -R a3718a7f2e746e02b745366a3c6c0fd0 +P 2c4bbd90e2fca593c186bf412b608aff8c9f9061 +R 2d15c61ad82393e3871d39f558fa91b1 U dan -Z deeb565ce480cc0dfb49de44342bb4c6 +Z 368095b2328022a768848f2679ec1079 diff --git a/manifest.uuid b/manifest.uuid index b01b761298..0475acf58b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2c4bbd90e2fca593c186bf412b608aff8c9f9061 \ No newline at end of file +25e5b7686a06e7f4ee993d8559d23143e2e8c7a8 \ No newline at end of file diff --git a/src/vdbeapi.c b/src/vdbeapi.c index a87b5c9acd..678f0d91e7 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -488,7 +488,7 @@ int sqlite3_step(sqlite3_stmt *pStmt){ && cnt++ < SQLITE_MAX_SCHEMA_RETRY && (rc2 = rc = sqlite3Reprepare(v))==SQLITE_OK ){ sqlite3_reset(pStmt); - v->expired = 0; + assert( v->expired==0 ); } if( rc2!=SQLITE_OK && ALWAYS(v->isPrepareV2) && ALWAYS(db->pErr) ){ /* This case occurs after failing to recompile an sql statement.