Fossil SCM
Update the built-in SQLite to the 3.29.0 release.
Commit
8c9eeb015191df08fb3adb83e142ee6b7575e99e08708ee519d6d8fb8eb54c7f
Parent
aa3f554cff43ea4…
2 files changed
+15
-9
+1
-1
+15
-9
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -1167,11 +1167,11 @@ | ||
| 1167 | 1167 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 1168 | 1168 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 1169 | 1169 | */ |
| 1170 | 1170 | #define SQLITE_VERSION "3.29.0" |
| 1171 | 1171 | #define SQLITE_VERSION_NUMBER 3029000 |
| 1172 | -#define SQLITE_SOURCE_ID "2019-07-08 13:45:02 8fb0c6d5a38e77aa4c5f394fb8af1b0c7c6a4790e932aabc213a3078ee9acaf6" | |
| 1172 | +#define SQLITE_SOURCE_ID "2019-07-10 17:32:03 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6" | |
| 1173 | 1173 | |
| 1174 | 1174 | /* |
| 1175 | 1175 | ** CAPI3REF: Run-Time Library Version Numbers |
| 1176 | 1176 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 1177 | 1177 | ** |
| @@ -75204,11 +75204,11 @@ | ||
| 75204 | 75204 | */ |
| 75205 | 75205 | SQLITE_PRIVATE int sqlite3RealSameAsInt(double r1, sqlite3_int64 i){ |
| 75206 | 75206 | double r2 = (double)i; |
| 75207 | 75207 | return r1==0.0 |
| 75208 | 75208 | || (memcmp(&r1, &r2, sizeof(r1))==0 |
| 75209 | - && i >= -2251799813685248 && i < 2251799813685248); | |
| 75209 | + && i >= -2251799813685248LL && i < 2251799813685248LL); | |
| 75210 | 75210 | } |
| 75211 | 75211 | |
| 75212 | 75212 | /* |
| 75213 | 75213 | ** Convert pMem so that it has type MEM_Real or MEM_Int. |
| 75214 | 75214 | ** Invalidate any prior representations. |
| @@ -181849,22 +181849,28 @@ | ||
| 181849 | 181849 | SQLITE_EXTENSION_INIT1 |
| 181850 | 181850 | #else |
| 181851 | 181851 | /* #include "sqlite3.h" */ |
| 181852 | 181852 | #endif |
| 181853 | 181853 | |
| 181854 | -/* #include <string.h> */ | |
| 181855 | -/* #include <assert.h> */ | |
| 181856 | -/* #include <stdio.h> */ | |
| 181857 | - | |
| 181858 | 181854 | #ifndef SQLITE_AMALGAMATION |
| 181859 | 181855 | #include "sqlite3rtree.h" |
| 181860 | 181856 | typedef sqlite3_int64 i64; |
| 181861 | 181857 | typedef sqlite3_uint64 u64; |
| 181862 | 181858 | typedef unsigned char u8; |
| 181863 | 181859 | typedef unsigned short u16; |
| 181864 | 181860 | typedef unsigned int u32; |
| 181861 | +#if !defined(NDEBUG) && !defined(SQLITE_DEBUG) | |
| 181862 | +# define NDEBUG 1 | |
| 181865 | 181863 | #endif |
| 181864 | +#if defined(NDEBUG) && defined(SQLITE_DEBUG) | |
| 181865 | +# undef NDEBUG | |
| 181866 | +#endif | |
| 181867 | +#endif | |
| 181868 | + | |
| 181869 | +/* #include <string.h> */ | |
| 181870 | +/* #include <stdio.h> */ | |
| 181871 | +/* #include <assert.h> */ | |
| 181866 | 181872 | |
| 181867 | 181873 | /* The following macro is used to suppress compiler warnings. |
| 181868 | 181874 | */ |
| 181869 | 181875 | #ifndef UNUSED_PARAMETER |
| 181870 | 181876 | # define UNUSED_PARAMETER(x) (void)(x) |
| @@ -219004,11 +219010,11 @@ | ||
| 219004 | 219010 | int nArg, /* Number of args */ |
| 219005 | 219011 | sqlite3_value **apUnused /* Function arguments */ |
| 219006 | 219012 | ){ |
| 219007 | 219013 | assert( nArg==0 ); |
| 219008 | 219014 | UNUSED_PARAM2(nArg, apUnused); |
| 219009 | - sqlite3_result_text(pCtx, "fts5: 2019-07-08 13:45:02 8fb0c6d5a38e77aa4c5f394fb8af1b0c7c6a4790e932aabc213a3078ee9acaf6", -1, SQLITE_TRANSIENT); | |
| 219015 | + sqlite3_result_text(pCtx, "fts5: 2019-07-10 17:32:03 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6", -1, SQLITE_TRANSIENT); | |
| 219010 | 219016 | } |
| 219011 | 219017 | |
| 219012 | 219018 | /* |
| 219013 | 219019 | ** Return true if zName is the extension on one of the shadow tables used |
| 219014 | 219020 | ** by this module. |
| @@ -223770,12 +223776,12 @@ | ||
| 223770 | 223776 | } |
| 223771 | 223777 | #endif /* SQLITE_CORE */ |
| 223772 | 223778 | #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ |
| 223773 | 223779 | |
| 223774 | 223780 | /************** End of stmt.c ************************************************/ |
| 223775 | -#if __LINE__!=223775 | |
| 223781 | +#if __LINE__!=223781 | |
| 223776 | 223782 | #undef SQLITE_SOURCE_ID |
| 223777 | -#define SQLITE_SOURCE_ID "2019-07-08 13:45:02 8fb0c6d5a38e77aa4c5f394fb8af1b0c7c6a4790e932aabc213a3078ee9aalt2" | |
| 223783 | +#define SQLITE_SOURCE_ID "2019-07-10 17:32:03 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88alt2" | |
| 223778 | 223784 | #endif |
| 223779 | 223785 | /* Return the source-id for this library */ |
| 223780 | 223786 | SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; } |
| 223781 | 223787 | /************************** End of sqlite3.c ******************************/ |
| 223782 | 223788 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -1167,11 +1167,11 @@ | |
| 1167 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 1168 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 1169 | */ |
| 1170 | #define SQLITE_VERSION "3.29.0" |
| 1171 | #define SQLITE_VERSION_NUMBER 3029000 |
| 1172 | #define SQLITE_SOURCE_ID "2019-07-08 13:45:02 8fb0c6d5a38e77aa4c5f394fb8af1b0c7c6a4790e932aabc213a3078ee9acaf6" |
| 1173 | |
| 1174 | /* |
| 1175 | ** CAPI3REF: Run-Time Library Version Numbers |
| 1176 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 1177 | ** |
| @@ -75204,11 +75204,11 @@ | |
| 75204 | */ |
| 75205 | SQLITE_PRIVATE int sqlite3RealSameAsInt(double r1, sqlite3_int64 i){ |
| 75206 | double r2 = (double)i; |
| 75207 | return r1==0.0 |
| 75208 | || (memcmp(&r1, &r2, sizeof(r1))==0 |
| 75209 | && i >= -2251799813685248 && i < 2251799813685248); |
| 75210 | } |
| 75211 | |
| 75212 | /* |
| 75213 | ** Convert pMem so that it has type MEM_Real or MEM_Int. |
| 75214 | ** Invalidate any prior representations. |
| @@ -181849,22 +181849,28 @@ | |
| 181849 | SQLITE_EXTENSION_INIT1 |
| 181850 | #else |
| 181851 | /* #include "sqlite3.h" */ |
| 181852 | #endif |
| 181853 | |
| 181854 | /* #include <string.h> */ |
| 181855 | /* #include <assert.h> */ |
| 181856 | /* #include <stdio.h> */ |
| 181857 | |
| 181858 | #ifndef SQLITE_AMALGAMATION |
| 181859 | #include "sqlite3rtree.h" |
| 181860 | typedef sqlite3_int64 i64; |
| 181861 | typedef sqlite3_uint64 u64; |
| 181862 | typedef unsigned char u8; |
| 181863 | typedef unsigned short u16; |
| 181864 | typedef unsigned int u32; |
| 181865 | #endif |
| 181866 | |
| 181867 | /* The following macro is used to suppress compiler warnings. |
| 181868 | */ |
| 181869 | #ifndef UNUSED_PARAMETER |
| 181870 | # define UNUSED_PARAMETER(x) (void)(x) |
| @@ -219004,11 +219010,11 @@ | |
| 219004 | int nArg, /* Number of args */ |
| 219005 | sqlite3_value **apUnused /* Function arguments */ |
| 219006 | ){ |
| 219007 | assert( nArg==0 ); |
| 219008 | UNUSED_PARAM2(nArg, apUnused); |
| 219009 | sqlite3_result_text(pCtx, "fts5: 2019-07-08 13:45:02 8fb0c6d5a38e77aa4c5f394fb8af1b0c7c6a4790e932aabc213a3078ee9acaf6", -1, SQLITE_TRANSIENT); |
| 219010 | } |
| 219011 | |
| 219012 | /* |
| 219013 | ** Return true if zName is the extension on one of the shadow tables used |
| 219014 | ** by this module. |
| @@ -223770,12 +223776,12 @@ | |
| 223770 | } |
| 223771 | #endif /* SQLITE_CORE */ |
| 223772 | #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ |
| 223773 | |
| 223774 | /************** End of stmt.c ************************************************/ |
| 223775 | #if __LINE__!=223775 |
| 223776 | #undef SQLITE_SOURCE_ID |
| 223777 | #define SQLITE_SOURCE_ID "2019-07-08 13:45:02 8fb0c6d5a38e77aa4c5f394fb8af1b0c7c6a4790e932aabc213a3078ee9aalt2" |
| 223778 | #endif |
| 223779 | /* Return the source-id for this library */ |
| 223780 | SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; } |
| 223781 | /************************** End of sqlite3.c ******************************/ |
| 223782 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -1167,11 +1167,11 @@ | |
| 1167 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 1168 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 1169 | */ |
| 1170 | #define SQLITE_VERSION "3.29.0" |
| 1171 | #define SQLITE_VERSION_NUMBER 3029000 |
| 1172 | #define SQLITE_SOURCE_ID "2019-07-10 17:32:03 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6" |
| 1173 | |
| 1174 | /* |
| 1175 | ** CAPI3REF: Run-Time Library Version Numbers |
| 1176 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 1177 | ** |
| @@ -75204,11 +75204,11 @@ | |
| 75204 | */ |
| 75205 | SQLITE_PRIVATE int sqlite3RealSameAsInt(double r1, sqlite3_int64 i){ |
| 75206 | double r2 = (double)i; |
| 75207 | return r1==0.0 |
| 75208 | || (memcmp(&r1, &r2, sizeof(r1))==0 |
| 75209 | && i >= -2251799813685248LL && i < 2251799813685248LL); |
| 75210 | } |
| 75211 | |
| 75212 | /* |
| 75213 | ** Convert pMem so that it has type MEM_Real or MEM_Int. |
| 75214 | ** Invalidate any prior representations. |
| @@ -181849,22 +181849,28 @@ | |
| 181849 | SQLITE_EXTENSION_INIT1 |
| 181850 | #else |
| 181851 | /* #include "sqlite3.h" */ |
| 181852 | #endif |
| 181853 | |
| 181854 | #ifndef SQLITE_AMALGAMATION |
| 181855 | #include "sqlite3rtree.h" |
| 181856 | typedef sqlite3_int64 i64; |
| 181857 | typedef sqlite3_uint64 u64; |
| 181858 | typedef unsigned char u8; |
| 181859 | typedef unsigned short u16; |
| 181860 | typedef unsigned int u32; |
| 181861 | #if !defined(NDEBUG) && !defined(SQLITE_DEBUG) |
| 181862 | # define NDEBUG 1 |
| 181863 | #endif |
| 181864 | #if defined(NDEBUG) && defined(SQLITE_DEBUG) |
| 181865 | # undef NDEBUG |
| 181866 | #endif |
| 181867 | #endif |
| 181868 | |
| 181869 | /* #include <string.h> */ |
| 181870 | /* #include <stdio.h> */ |
| 181871 | /* #include <assert.h> */ |
| 181872 | |
| 181873 | /* The following macro is used to suppress compiler warnings. |
| 181874 | */ |
| 181875 | #ifndef UNUSED_PARAMETER |
| 181876 | # define UNUSED_PARAMETER(x) (void)(x) |
| @@ -219004,11 +219010,11 @@ | |
| 219010 | int nArg, /* Number of args */ |
| 219011 | sqlite3_value **apUnused /* Function arguments */ |
| 219012 | ){ |
| 219013 | assert( nArg==0 ); |
| 219014 | UNUSED_PARAM2(nArg, apUnused); |
| 219015 | sqlite3_result_text(pCtx, "fts5: 2019-07-10 17:32:03 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6", -1, SQLITE_TRANSIENT); |
| 219016 | } |
| 219017 | |
| 219018 | /* |
| 219019 | ** Return true if zName is the extension on one of the shadow tables used |
| 219020 | ** by this module. |
| @@ -223770,12 +223776,12 @@ | |
| 223776 | } |
| 223777 | #endif /* SQLITE_CORE */ |
| 223778 | #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ |
| 223779 | |
| 223780 | /************** End of stmt.c ************************************************/ |
| 223781 | #if __LINE__!=223781 |
| 223782 | #undef SQLITE_SOURCE_ID |
| 223783 | #define SQLITE_SOURCE_ID "2019-07-10 17:32:03 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88alt2" |
| 223784 | #endif |
| 223785 | /* Return the source-id for this library */ |
| 223786 | SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; } |
| 223787 | /************************** End of sqlite3.c ******************************/ |
| 223788 |
+1
-1
| --- src/sqlite3.h | ||
| +++ src/sqlite3.h | ||
| @@ -123,11 +123,11 @@ | ||
| 123 | 123 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 124 | 124 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 125 | 125 | */ |
| 126 | 126 | #define SQLITE_VERSION "3.29.0" |
| 127 | 127 | #define SQLITE_VERSION_NUMBER 3029000 |
| 128 | -#define SQLITE_SOURCE_ID "2019-07-08 13:45:02 8fb0c6d5a38e77aa4c5f394fb8af1b0c7c6a4790e932aabc213a3078ee9acaf6" | |
| 128 | +#define SQLITE_SOURCE_ID "2019-07-10 17:32:03 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6" | |
| 129 | 129 | |
| 130 | 130 | /* |
| 131 | 131 | ** CAPI3REF: Run-Time Library Version Numbers |
| 132 | 132 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 133 | 133 | ** |
| 134 | 134 |
| --- src/sqlite3.h | |
| +++ src/sqlite3.h | |
| @@ -123,11 +123,11 @@ | |
| 123 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 124 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 125 | */ |
| 126 | #define SQLITE_VERSION "3.29.0" |
| 127 | #define SQLITE_VERSION_NUMBER 3029000 |
| 128 | #define SQLITE_SOURCE_ID "2019-07-08 13:45:02 8fb0c6d5a38e77aa4c5f394fb8af1b0c7c6a4790e932aabc213a3078ee9acaf6" |
| 129 | |
| 130 | /* |
| 131 | ** CAPI3REF: Run-Time Library Version Numbers |
| 132 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 133 | ** |
| 134 |
| --- src/sqlite3.h | |
| +++ src/sqlite3.h | |
| @@ -123,11 +123,11 @@ | |
| 123 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 124 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 125 | */ |
| 126 | #define SQLITE_VERSION "3.29.0" |
| 127 | #define SQLITE_VERSION_NUMBER 3029000 |
| 128 | #define SQLITE_SOURCE_ID "2019-07-10 17:32:03 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6" |
| 129 | |
| 130 | /* |
| 131 | ** CAPI3REF: Run-Time Library Version Numbers |
| 132 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 133 | ** |
| 134 |