From: drh Date: Wed, 20 May 2009 16:22:02 +0000 (+0000) Subject: Remove unused, undocumented, and untested error reporting logic from the X-Git-Tag: version-3.6.15~97 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e27890ed9e0da5dd8165497635be771ad7523ba;p=thirdparty%2Fsqlite.git Remove unused, undocumented, and untested error reporting logic from the xFindFunction interface in virtual tables. (CVS 6660) FossilOrigin-Name: 55d6ced262f5281076e4a68097ed21e150a9c225 --- diff --git a/manifest b/manifest index 1b05642d43..71494ab7c1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Updates\sto\sthe\sextension\sloading\slogic\sto\ssupport\sfull\scoverage\stesting.\s(CVS\s6659) -D 2009-05-20T02:40:46 +C Remove\sunused,\sundocumented,\sand\suntested\serror\sreporting\slogic\sfrom\sthe\nxFindFunction\sinterface\sin\svirtual\stables.\s(CVS\s6660) +D 2009-05-20T16:22:02 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -210,7 +210,7 @@ F src/vdbeapi.c 86aa27a5f3493aaffb8ac051782aa3b22670d7ed F src/vdbeaux.c 1a07329bdf51cc3687f88d9f5b2bd3f1d47cc5a8 F src/vdbeblob.c 5c5abe9af28316772e7829359f6f9cda2c737ebd F src/vdbemem.c d8b985eeb88214941380372466a30ca410043a93 -F src/vtab.c 1e285c90d04f27808709b42c428be628fb309b77 +F src/vtab.c f998f539acbf0f1c5f8ee6bd0cdf6a641c802242 F src/walker.c 7cdf63223c953d4343c6833e940f110281a378ee F src/where.c c5fa4a7a58880aecc657ebce5f8df98c9b67eec0 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 @@ -729,7 +729,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P f678ed34faab88f4e126e553119773386c7c84fa -R a4ff1e249cdc6a153d70111a90dd62bc +P 929cfbc66f6e2ea6b44417305d0f4ae36567c9bf +R cfd08e5b3a0fcc71899f8a11df4112dc U drh -Z e9babf13c984228aedcd2756c0b1fd97 +Z b7b7868ab892ecebd1d46c334eedc57e diff --git a/manifest.uuid b/manifest.uuid index 5d39f55411..d0c11339a6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -929cfbc66f6e2ea6b44417305d0f4ae36567c9bf \ No newline at end of file +55d6ced262f5281076e4a68097ed21e150a9c225 \ No newline at end of file diff --git a/src/vtab.c b/src/vtab.c index 036addfa1e..1b8e8cea8e 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to help implement virtual tables. ** -** $Id: vtab.c,v 1.87 2009/05/11 23:38:00 drh Exp $ +** $Id: vtab.c,v 1.88 2009/05/20 16:22:02 drh Exp $ */ #ifndef SQLITE_OMIT_VIRTUALTABLE #include "sqliteInt.h" @@ -803,11 +803,6 @@ FuncDef *sqlite3VtabOverloadFunction( } rc = pMod->xFindFunction(pVtab, nArg, zLowerName, &xFunc, &pArg); sqlite3DbFree(db, zLowerName); - if( pVtab->zErrMsg ){ - sqlite3Error(db, rc, "%s", pVtab->zErrMsg); - sqlite3DbFree(db, pVtab->zErrMsg); - pVtab->zErrMsg = 0; - } } if( rc==0 ){ return pDef;