Remove an unreachable branch from the function initialization logic.

FossilOrigin-Name: 064d3ddd6199b7b049b1706974e4295f78fb5ab9
This commit is contained in:
drh 2010-04-25 20:58:37 +00:00
parent 545f587fc8
commit a4741840f6
3 changed files with 17 additions and 19 deletions

View File

@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
C When\scommands\ssuch\sas\sALTER\sTABLE\sand\sVACUUM\suse\sSQL\sinternally,\smake\ssure\nthey\suse\sonly\sthe\sbuilt-in\sfunctions\sand\snot\sapplication-defined\soverrides\nfor\sthose\sfunctions.
D 2010-04-24T14:02:59
C Remove\san\sunreachable\sbranch\sfrom\sthe\sfunction\sinitialization\slogic.
D 2010-04-25T20:58:37
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -124,7 +124,7 @@ F src/delete.c 610dc008e88a9599f905f5cbe9577ac9c36e0581
F src/expr.c 6baed2a0448d494233d9c0a610eea018ab386a32
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c e2116672a6bd610dc888e27df292ebc7999c9bb0
F src/func.c b4af81088b1ad2ceea42d70a7aa048a48d18733f
F src/func.c 0c28599430856631216b6c0131c51c89bf516026
F src/global.c 5a9c1e3c93213ca574786ac1caa976ce8f709105
F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@ -801,14 +801,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P e79dac3c2f723ed7cc62fcef468f53952711f242
R f7b3f2f2586b016425d2ff4d0aa6d5e4
P 0291ed974d5bf1e344e2c38422530cc961b897da
R fd6e4addad7e1a8279cfaf819615b3fa
U drh
Z 60e8a7849ac5e43c2a7c878285e8be5d
Z 7d20f9f474a13977b8eb713940e9f8af
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFL0voooxKgR168RlERAuygAJ9JZEPkPJWwA9gu3SJJpCJ6uLWSCACfXJK2
t7ZFFTqEHyFHDlhkRqjBdIY=
=45i3
iD8DBQFL1Kz/oxKgR168RlERAgG0AJoDjmhXedAET5V0L1Z5n0cXBHnSMwCff/bm
c8fjZiKrCLhVKjzQJ+FPaRw=
=pPi4
-----END PGP SIGNATURE-----

View File

@ -1 +1 @@
0291ed974d5bf1e344e2c38422530cc961b897da
064d3ddd6199b7b049b1706974e4295f78fb5ab9

View File

@ -1411,17 +1411,15 @@ static void groupConcatFinalize(sqlite3_context *context){
}
/*
** This function registered all of the above C functions as SQL
** functions. This should be the only routine in this file with
** external linkage.
** This routine does per-connection function registration. Most
** of the built-in functions above are part of the global function set.
** This routine only deals with those that are not global.
*/
void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
if( !db->mallocFailed ){
int rc = sqlite3_overload_function(db, "MATCH", 2);
assert( rc==SQLITE_NOMEM || rc==SQLITE_OK );
if( rc==SQLITE_NOMEM ){
db->mallocFailed = 1;
}
int rc = sqlite3_overload_function(db, "MATCH", 2);
assert( rc==SQLITE_NOMEM || rc==SQLITE_OK );
if( rc==SQLITE_NOMEM ){
db->mallocFailed = 1;
}
}