diff --git a/manifest b/manifest index 3ffd9ba39d..dc8c3ab5d3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Check\sin\sthe\smissing\sstatus.c\ssource\sfile.\s(CVS\s5245) -D 2008-06-19T13:20:02 +C Add\srecent\sAPI\sadditions\sto\sthe\sloadable\sextension\sinterface.\s(CVS\s5246) +D 2008-06-19T15:06:24 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -114,7 +114,7 @@ F src/hwtime.h 745961687a65ef8918cd551c02e5ccb4b8e772de F src/insert.c c2ead6c36566de8e3f130e7ab1431723a269d5d7 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e F src/legacy.c 3626c71fb70912abec9a4312beba753a9ce800df -F src/loadext.c 2ac671f42a8ce15e2a58155b9d7f6c61eb7e127e +F src/loadext.c 40024a0f476c1279494876b9a002001b29e5d3e3 F src/main.c d75dad89c689c92cfb20d45f3ef31baca08eb896 F src/malloc.c 33b8a20684e65ce13f94e5b14fb0e6cdc335c5d1 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a @@ -144,7 +144,7 @@ F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a F src/select.c 669687459e7d0193c89de06c5dbed55b4a41191c F src/shell.c a12ea645271b7876c8f080146f48e20b00d367ec F src/sqlite.h.in cc64323ecc21320692c12726102976689ee5ae53 -F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3 +F src/sqlite3ext.h f162a72daef5ebf8b211fe8c0ec96e85d22fbf9b F src/sqliteInt.h 6dd55232e738a4dac23475cd4b0e444dff75c896 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8 F src/status.c 6cb10377992505bd69f1ca1d75c1240a65f25a58 @@ -600,7 +600,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 9cd7f8669a59c6096331229df2e2ad87e628abab -R 2ae02cc3666590b0ae8cac03168cec93 +P 298113d4a707ecf59d5dfd8bca45bfe734fb9fbb +R 42f17a00236aadb90310fa7ec4da2a6e U drh -Z dc8fb3a0d249f077cc181d199fa20d70 +Z 4fa413bd990aa53101659d02698816d3 diff --git a/manifest.uuid b/manifest.uuid index 3e83217856..e514655c44 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -298113d4a707ecf59d5dfd8bca45bfe734fb9fbb \ No newline at end of file +12ba27d94e3fb448f88b5efb43b35242fd893297 \ No newline at end of file diff --git a/src/loadext.c b/src/loadext.c index a045d1302f..23d3d0423b 100644 --- a/src/loadext.c +++ b/src/loadext.c @@ -12,7 +12,7 @@ ** This file contains code used to dynamically load extensions into ** the SQLite library. ** -** $Id: loadext.c,v 1.49 2008/06/18 17:09:10 danielk1977 Exp $ +** $Id: loadext.c,v 1.50 2008/06/19 15:06:24 drh Exp $ */ #ifndef SQLITE_CORE @@ -305,6 +305,15 @@ static const sqlite3_api_routines sqlite3Apis = { sqlite3_test_control, sqlite3_randomness, sqlite3_context_db_handle, + + /* + ** Added for 3.6.0 + */ + sqlite3_extended_result_codes, + sqlite3_limit, + sqlite3_next_stmt, + sqlite3_sql, + sqlite3_status, }; /* diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h index 6c538ffe0e..15e49e6845 100644 --- a/src/sqlite3ext.h +++ b/src/sqlite3ext.h @@ -15,7 +15,7 @@ ** as extensions by SQLite should #include this file instead of ** sqlite3.h. ** -** @(#) $Id: sqlite3ext.h,v 1.21 2008/03/19 21:45:51 drh Exp $ +** @(#) $Id: sqlite3ext.h,v 1.22 2008/06/19 15:06:24 drh Exp $ */ #ifndef _SQLITE3EXT_H_ #define _SQLITE3EXT_H_ @@ -188,6 +188,11 @@ struct sqlite3_api_routines { int (*test_control)(int, ...); void (*randomness)(int,void*); sqlite3 *(*context_db_handle)(sqlite3_context*); + int (*extended_result_codes)(sqlite3*,int); + int (*limit)(sqlite3*,int,int); + sqlite3_stmt *(*next_stmt)(sqlite3*,sqlite3_stmt*); + const char *(*sql)(sqlite3_stmt*); + int (*status)(int,int*,int*,int); }; /* @@ -354,6 +359,11 @@ struct sqlite3_api_routines { #define sqlite3_test_control sqlite3_api->test_control #define sqlite3_randomness sqlite3_api->randomness #define sqlite3_context_db_handle sqlite3_api->context_db_handle +#define sqlite3_extended_result_codes sqlite3_api->extended_result_codes +#define sqlite3_limit sqlite3_api->limit +#define sqlite3_next_stmt sqlite3_api->next_stmt +#define sqlite3_sql sqlite3_api->sql +#define sqlite3_status sqlite3_api->status #endif /* SQLITE_CORE */ #define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api;