mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix disabled implementation-mark comments in func.c.

Browse Source 
FossilOrigin-Name: 57c0960038b8ce97f9d6665f15e7f6ec310c681f
This commit is contained in:
drh 2010-08-03 18:06:25 +00:00
parent 6dc8490232
commit a3e414cd48
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifest
View File

@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C Fix\sthe\sREPLACE\sconflict\sresolution\sso\sthat\sit\sfalls\sback\sto\sABORT\swhen\na\sCHECK\sconstraint\sfails.\s\sTicket\s[c38baa3d969eab794]. C Fix\sdisabled\simplementation-mark\scomments\sin\sfunc.c.
D 2010-08-03T13:08:55 D 2010-08-03T18:06:25
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -128,7 +128,7 @@ F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd
F src/expr.c a0fd9c5e248229851077de92f2e9346f2c43ed46 F src/expr.c a0fd9c5e248229851077de92f2e9346f2c43ed46
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c 58bbf52c6ddd3f64ca40a3230f9e548a83a5cb16 F src/fkey.c 58bbf52c6ddd3f64ca40a3230f9e548a83a5cb16
F src/func.c 75dc1fd91e5692cadb80d257bab68d7343060467 F src/func.c 464b0dc70618b896c402c574eb04bc5eacf35341
F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3 F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@ -844,14 +844,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 016486c7d544dcf9b7422cb0fb9804aa1c418f68 P 4e157b774764b8bafc9fabb88decf54f178b5ff5
R 3325483e922777e07054f0cb49438593 R 2ffda3ab686430275e530bf434e41e4c
U drh U drh
Z d4d184e312b9a6c1d14017f77666543c Z 636446afbb2581f1ac8c757ae258a4e0
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMWBTroxKgR168RlERAs2pAJ9ife269/S3Uo4Ju+ipuIdk7AK4VwCeNuGn iD8DBQFMWFqkoxKgR168RlERAoOBAKCD0AqnZ6ZzbybLHgm4lZfoGX3cfgCfa6ef
CUQtoV3bUC+VGAu/OWy/3UA= C79lcWSk6pzbtaW4+fqCLFQ=
=m2KU =jbsY
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@ -1 +1 @@
4e157b774764b8bafc9fabb88decf54f178b5ff5 57c0960038b8ce97f9d6665f15e7f6ec310c681f

11
src/func.c
View File

@ -788,8 +788,10 @@ static void compileoptionusedFunc(
const char *zOptName; const char *zOptName;
assert( argc==1 ); assert( argc==1 );
UNUSED_PARAMETER(argc); UNUSED_PARAMETER(argc);
/* IMP: R-xxxx This function is an SQL wrapper around the /* IMP: R-39564-36305 The sqlite_compileoption_used() SQL
** sqlite3_compileoption_used() C interface. */ ** function is a wrapper around the sqlite3_compileoption_used() C/C++
** function.
*/
if( (zOptName = (const char*)sqlite3_value_text(argv[0]))!=0 ){ if( (zOptName = (const char*)sqlite3_value_text(argv[0]))!=0 ){
sqlite3_result_int(context, sqlite3_compileoption_used(zOptName)); sqlite3_result_int(context, sqlite3_compileoption_used(zOptName));
} }
@ -810,8 +812,9 @@ static void compileoptiongetFunc(
int n; int n;
assert( argc==1 ); assert( argc==1 );
UNUSED_PARAMETER(argc); UNUSED_PARAMETER(argc);
/* IMP: R-xxxx This function is an SQL wrapper around the /* IMP: R-04922-24076 The sqlite_compileoption_get() SQL function
** sqlite3_compileoption_get() C interface. */ ** is a wrapper around the sqlite3_compileoption_get() C/C++ function.
*/
n = sqlite3_value_int(argv[0]); n = sqlite3_value_int(argv[0]);
sqlite3_result_text(context, sqlite3_compileoption_get(n), -1, SQLITE_STATIC); sqlite3_result_text(context, sqlite3_compileoption_get(n), -1, SQLITE_STATIC);
} }