Fossil SCM
Check-in the fix for the i16/i64 mixup with the ynVar type in SQLite.
Commit
e200c8d65f4fa4ef569ae38f5dd7baa2d6a3b058
Parent
355e34ba9d17508…
2 files changed
+5
-5
+3
-3
+5
-5
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -649,11 +649,11 @@ | ||
| 649 | 649 | ** |
| 650 | 650 | ** Requirements: [H10011] [H10014] |
| 651 | 651 | */ |
| 652 | 652 | #define SQLITE_VERSION "3.6.20" |
| 653 | 653 | #define SQLITE_VERSION_NUMBER 3006020 |
| 654 | -#define SQLITE_SOURCE_ID "2009-11-04 13:30:02 eb7a544fe49d1626bacecfe53ddc03fe082e3243" | |
| 654 | +#define SQLITE_SOURCE_ID "2009-11-04 23:02:52 f1c09acaca3e205acf5b077c9b2d0fe35f035c1e" | |
| 655 | 655 | |
| 656 | 656 | /* |
| 657 | 657 | ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100> |
| 658 | 658 | ** KEYWORDS: sqlite3_version |
| 659 | 659 | ** |
| @@ -1353,11 +1353,11 @@ | ||
| 1353 | 1353 | ** CAPI3REF: Initialize The SQLite Library {H10130} <S20000><S30100> |
| 1354 | 1354 | ** |
| 1355 | 1355 | ** The sqlite3_initialize() routine initializes the |
| 1356 | 1356 | ** SQLite library. The sqlite3_shutdown() routine |
| 1357 | 1357 | ** deallocates any resources that were allocated by sqlite3_initialize(). |
| 1358 | -** This routines are designed to aid in process initialization and | |
| 1358 | +** These routines are designed to aid in process initialization and | |
| 1359 | 1359 | ** shutdown on embedded systems. Workstation applications using |
| 1360 | 1360 | ** SQLite normally do not need to invoke either of these routines. |
| 1361 | 1361 | ** |
| 1362 | 1362 | ** A call to sqlite3_initialize() is an "effective" call if it is |
| 1363 | 1363 | ** the first time sqlite3_initialize() is invoked during the lifetime of |
| @@ -2923,11 +2923,11 @@ | ||
| 2923 | 2923 | ** recommended for all new programs. The two older interfaces are retained |
| 2924 | 2924 | ** for backwards compatibility, but their use is discouraged. |
| 2925 | 2925 | ** In the "v2" interfaces, the prepared statement |
| 2926 | 2926 | ** that is returned (the [sqlite3_stmt] object) contains a copy of the |
| 2927 | 2927 | ** original SQL text. This causes the [sqlite3_step()] interface to |
| 2928 | -** behave a differently in three ways: | |
| 2928 | +** behave differently in three ways: | |
| 2929 | 2929 | ** |
| 2930 | 2930 | ** <ol> |
| 2931 | 2931 | ** <li> |
| 2932 | 2932 | ** If the database schema changes, instead of returning [SQLITE_SCHEMA] as it |
| 2933 | 2933 | ** always used to do, [sqlite3_step()] will automatically recompile the SQL |
| @@ -9125,11 +9125,11 @@ | ||
| 9125 | 9125 | ** need more than about 10 or 20 variables. But some extreme users want |
| 9126 | 9126 | ** to have prepared statements with over 32767 variables, and for them |
| 9127 | 9127 | ** the option is available (at compile-time). |
| 9128 | 9128 | */ |
| 9129 | 9129 | #if SQLITE_MAX_VARIABLE_NUMBER<=32767 |
| 9130 | -typedef i64 ynVar; | |
| 9130 | +typedef i16 ynVar; | |
| 9131 | 9131 | #else |
| 9132 | 9132 | typedef int ynVar; |
| 9133 | 9133 | #endif |
| 9134 | 9134 | |
| 9135 | 9135 | /* |
| @@ -36374,11 +36374,11 @@ | ||
| 36374 | 36374 | void (*xCodecSizeChng)(void*,int,int), |
| 36375 | 36375 | void (*xCodecFree)(void*), |
| 36376 | 36376 | void *pCodec |
| 36377 | 36377 | ){ |
| 36378 | 36378 | if( pPager->xCodecFree ) pPager->xCodecFree(pPager->pCodec); |
| 36379 | - pPager->xCodec = xCodec; | |
| 36379 | + pPager->xCodec = pPager->memDb ? 0 : xCodec; | |
| 36380 | 36380 | pPager->xCodecSizeChng = xCodecSizeChng; |
| 36381 | 36381 | pPager->xCodecFree = xCodecFree; |
| 36382 | 36382 | pPager->pCodec = pCodec; |
| 36383 | 36383 | pagerReportSize(pPager); |
| 36384 | 36384 | } |
| 36385 | 36385 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -649,11 +649,11 @@ | |
| 649 | ** |
| 650 | ** Requirements: [H10011] [H10014] |
| 651 | */ |
| 652 | #define SQLITE_VERSION "3.6.20" |
| 653 | #define SQLITE_VERSION_NUMBER 3006020 |
| 654 | #define SQLITE_SOURCE_ID "2009-11-04 13:30:02 eb7a544fe49d1626bacecfe53ddc03fe082e3243" |
| 655 | |
| 656 | /* |
| 657 | ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100> |
| 658 | ** KEYWORDS: sqlite3_version |
| 659 | ** |
| @@ -1353,11 +1353,11 @@ | |
| 1353 | ** CAPI3REF: Initialize The SQLite Library {H10130} <S20000><S30100> |
| 1354 | ** |
| 1355 | ** The sqlite3_initialize() routine initializes the |
| 1356 | ** SQLite library. The sqlite3_shutdown() routine |
| 1357 | ** deallocates any resources that were allocated by sqlite3_initialize(). |
| 1358 | ** This routines are designed to aid in process initialization and |
| 1359 | ** shutdown on embedded systems. Workstation applications using |
| 1360 | ** SQLite normally do not need to invoke either of these routines. |
| 1361 | ** |
| 1362 | ** A call to sqlite3_initialize() is an "effective" call if it is |
| 1363 | ** the first time sqlite3_initialize() is invoked during the lifetime of |
| @@ -2923,11 +2923,11 @@ | |
| 2923 | ** recommended for all new programs. The two older interfaces are retained |
| 2924 | ** for backwards compatibility, but their use is discouraged. |
| 2925 | ** In the "v2" interfaces, the prepared statement |
| 2926 | ** that is returned (the [sqlite3_stmt] object) contains a copy of the |
| 2927 | ** original SQL text. This causes the [sqlite3_step()] interface to |
| 2928 | ** behave a differently in three ways: |
| 2929 | ** |
| 2930 | ** <ol> |
| 2931 | ** <li> |
| 2932 | ** If the database schema changes, instead of returning [SQLITE_SCHEMA] as it |
| 2933 | ** always used to do, [sqlite3_step()] will automatically recompile the SQL |
| @@ -9125,11 +9125,11 @@ | |
| 9125 | ** need more than about 10 or 20 variables. But some extreme users want |
| 9126 | ** to have prepared statements with over 32767 variables, and for them |
| 9127 | ** the option is available (at compile-time). |
| 9128 | */ |
| 9129 | #if SQLITE_MAX_VARIABLE_NUMBER<=32767 |
| 9130 | typedef i64 ynVar; |
| 9131 | #else |
| 9132 | typedef int ynVar; |
| 9133 | #endif |
| 9134 | |
| 9135 | /* |
| @@ -36374,11 +36374,11 @@ | |
| 36374 | void (*xCodecSizeChng)(void*,int,int), |
| 36375 | void (*xCodecFree)(void*), |
| 36376 | void *pCodec |
| 36377 | ){ |
| 36378 | if( pPager->xCodecFree ) pPager->xCodecFree(pPager->pCodec); |
| 36379 | pPager->xCodec = xCodec; |
| 36380 | pPager->xCodecSizeChng = xCodecSizeChng; |
| 36381 | pPager->xCodecFree = xCodecFree; |
| 36382 | pPager->pCodec = pCodec; |
| 36383 | pagerReportSize(pPager); |
| 36384 | } |
| 36385 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -649,11 +649,11 @@ | |
| 649 | ** |
| 650 | ** Requirements: [H10011] [H10014] |
| 651 | */ |
| 652 | #define SQLITE_VERSION "3.6.20" |
| 653 | #define SQLITE_VERSION_NUMBER 3006020 |
| 654 | #define SQLITE_SOURCE_ID "2009-11-04 23:02:52 f1c09acaca3e205acf5b077c9b2d0fe35f035c1e" |
| 655 | |
| 656 | /* |
| 657 | ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100> |
| 658 | ** KEYWORDS: sqlite3_version |
| 659 | ** |
| @@ -1353,11 +1353,11 @@ | |
| 1353 | ** CAPI3REF: Initialize The SQLite Library {H10130} <S20000><S30100> |
| 1354 | ** |
| 1355 | ** The sqlite3_initialize() routine initializes the |
| 1356 | ** SQLite library. The sqlite3_shutdown() routine |
| 1357 | ** deallocates any resources that were allocated by sqlite3_initialize(). |
| 1358 | ** These routines are designed to aid in process initialization and |
| 1359 | ** shutdown on embedded systems. Workstation applications using |
| 1360 | ** SQLite normally do not need to invoke either of these routines. |
| 1361 | ** |
| 1362 | ** A call to sqlite3_initialize() is an "effective" call if it is |
| 1363 | ** the first time sqlite3_initialize() is invoked during the lifetime of |
| @@ -2923,11 +2923,11 @@ | |
| 2923 | ** recommended for all new programs. The two older interfaces are retained |
| 2924 | ** for backwards compatibility, but their use is discouraged. |
| 2925 | ** In the "v2" interfaces, the prepared statement |
| 2926 | ** that is returned (the [sqlite3_stmt] object) contains a copy of the |
| 2927 | ** original SQL text. This causes the [sqlite3_step()] interface to |
| 2928 | ** behave differently in three ways: |
| 2929 | ** |
| 2930 | ** <ol> |
| 2931 | ** <li> |
| 2932 | ** If the database schema changes, instead of returning [SQLITE_SCHEMA] as it |
| 2933 | ** always used to do, [sqlite3_step()] will automatically recompile the SQL |
| @@ -9125,11 +9125,11 @@ | |
| 9125 | ** need more than about 10 or 20 variables. But some extreme users want |
| 9126 | ** to have prepared statements with over 32767 variables, and for them |
| 9127 | ** the option is available (at compile-time). |
| 9128 | */ |
| 9129 | #if SQLITE_MAX_VARIABLE_NUMBER<=32767 |
| 9130 | typedef i16 ynVar; |
| 9131 | #else |
| 9132 | typedef int ynVar; |
| 9133 | #endif |
| 9134 | |
| 9135 | /* |
| @@ -36374,11 +36374,11 @@ | |
| 36374 | void (*xCodecSizeChng)(void*,int,int), |
| 36375 | void (*xCodecFree)(void*), |
| 36376 | void *pCodec |
| 36377 | ){ |
| 36378 | if( pPager->xCodecFree ) pPager->xCodecFree(pPager->pCodec); |
| 36379 | pPager->xCodec = pPager->memDb ? 0 : xCodec; |
| 36380 | pPager->xCodecSizeChng = xCodecSizeChng; |
| 36381 | pPager->xCodecFree = xCodecFree; |
| 36382 | pPager->pCodec = pCodec; |
| 36383 | pagerReportSize(pPager); |
| 36384 | } |
| 36385 |
+3
-3
| --- src/sqlite3.h | ||
| +++ src/sqlite3.h | ||
| @@ -119,11 +119,11 @@ | ||
| 119 | 119 | ** |
| 120 | 120 | ** Requirements: [H10011] [H10014] |
| 121 | 121 | */ |
| 122 | 122 | #define SQLITE_VERSION "3.6.20" |
| 123 | 123 | #define SQLITE_VERSION_NUMBER 3006020 |
| 124 | -#define SQLITE_SOURCE_ID "2009-11-04 13:30:02 eb7a544fe49d1626bacecfe53ddc03fe082e3243" | |
| 124 | +#define SQLITE_SOURCE_ID "2009-11-04 23:02:52 f1c09acaca3e205acf5b077c9b2d0fe35f035c1e" | |
| 125 | 125 | |
| 126 | 126 | /* |
| 127 | 127 | ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100> |
| 128 | 128 | ** KEYWORDS: sqlite3_version |
| 129 | 129 | ** |
| @@ -823,11 +823,11 @@ | ||
| 823 | 823 | ** CAPI3REF: Initialize The SQLite Library {H10130} <S20000><S30100> |
| 824 | 824 | ** |
| 825 | 825 | ** The sqlite3_initialize() routine initializes the |
| 826 | 826 | ** SQLite library. The sqlite3_shutdown() routine |
| 827 | 827 | ** deallocates any resources that were allocated by sqlite3_initialize(). |
| 828 | -** This routines are designed to aid in process initialization and | |
| 828 | +** These routines are designed to aid in process initialization and | |
| 829 | 829 | ** shutdown on embedded systems. Workstation applications using |
| 830 | 830 | ** SQLite normally do not need to invoke either of these routines. |
| 831 | 831 | ** |
| 832 | 832 | ** A call to sqlite3_initialize() is an "effective" call if it is |
| 833 | 833 | ** the first time sqlite3_initialize() is invoked during the lifetime of |
| @@ -2393,11 +2393,11 @@ | ||
| 2393 | 2393 | ** recommended for all new programs. The two older interfaces are retained |
| 2394 | 2394 | ** for backwards compatibility, but their use is discouraged. |
| 2395 | 2395 | ** In the "v2" interfaces, the prepared statement |
| 2396 | 2396 | ** that is returned (the [sqlite3_stmt] object) contains a copy of the |
| 2397 | 2397 | ** original SQL text. This causes the [sqlite3_step()] interface to |
| 2398 | -** behave a differently in three ways: | |
| 2398 | +** behave differently in three ways: | |
| 2399 | 2399 | ** |
| 2400 | 2400 | ** <ol> |
| 2401 | 2401 | ** <li> |
| 2402 | 2402 | ** If the database schema changes, instead of returning [SQLITE_SCHEMA] as it |
| 2403 | 2403 | ** always used to do, [sqlite3_step()] will automatically recompile the SQL |
| 2404 | 2404 |
| --- src/sqlite3.h | |
| +++ src/sqlite3.h | |
| @@ -119,11 +119,11 @@ | |
| 119 | ** |
| 120 | ** Requirements: [H10011] [H10014] |
| 121 | */ |
| 122 | #define SQLITE_VERSION "3.6.20" |
| 123 | #define SQLITE_VERSION_NUMBER 3006020 |
| 124 | #define SQLITE_SOURCE_ID "2009-11-04 13:30:02 eb7a544fe49d1626bacecfe53ddc03fe082e3243" |
| 125 | |
| 126 | /* |
| 127 | ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100> |
| 128 | ** KEYWORDS: sqlite3_version |
| 129 | ** |
| @@ -823,11 +823,11 @@ | |
| 823 | ** CAPI3REF: Initialize The SQLite Library {H10130} <S20000><S30100> |
| 824 | ** |
| 825 | ** The sqlite3_initialize() routine initializes the |
| 826 | ** SQLite library. The sqlite3_shutdown() routine |
| 827 | ** deallocates any resources that were allocated by sqlite3_initialize(). |
| 828 | ** This routines are designed to aid in process initialization and |
| 829 | ** shutdown on embedded systems. Workstation applications using |
| 830 | ** SQLite normally do not need to invoke either of these routines. |
| 831 | ** |
| 832 | ** A call to sqlite3_initialize() is an "effective" call if it is |
| 833 | ** the first time sqlite3_initialize() is invoked during the lifetime of |
| @@ -2393,11 +2393,11 @@ | |
| 2393 | ** recommended for all new programs. The two older interfaces are retained |
| 2394 | ** for backwards compatibility, but their use is discouraged. |
| 2395 | ** In the "v2" interfaces, the prepared statement |
| 2396 | ** that is returned (the [sqlite3_stmt] object) contains a copy of the |
| 2397 | ** original SQL text. This causes the [sqlite3_step()] interface to |
| 2398 | ** behave a differently in three ways: |
| 2399 | ** |
| 2400 | ** <ol> |
| 2401 | ** <li> |
| 2402 | ** If the database schema changes, instead of returning [SQLITE_SCHEMA] as it |
| 2403 | ** always used to do, [sqlite3_step()] will automatically recompile the SQL |
| 2404 |
| --- src/sqlite3.h | |
| +++ src/sqlite3.h | |
| @@ -119,11 +119,11 @@ | |
| 119 | ** |
| 120 | ** Requirements: [H10011] [H10014] |
| 121 | */ |
| 122 | #define SQLITE_VERSION "3.6.20" |
| 123 | #define SQLITE_VERSION_NUMBER 3006020 |
| 124 | #define SQLITE_SOURCE_ID "2009-11-04 23:02:52 f1c09acaca3e205acf5b077c9b2d0fe35f035c1e" |
| 125 | |
| 126 | /* |
| 127 | ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100> |
| 128 | ** KEYWORDS: sqlite3_version |
| 129 | ** |
| @@ -823,11 +823,11 @@ | |
| 823 | ** CAPI3REF: Initialize The SQLite Library {H10130} <S20000><S30100> |
| 824 | ** |
| 825 | ** The sqlite3_initialize() routine initializes the |
| 826 | ** SQLite library. The sqlite3_shutdown() routine |
| 827 | ** deallocates any resources that were allocated by sqlite3_initialize(). |
| 828 | ** These routines are designed to aid in process initialization and |
| 829 | ** shutdown on embedded systems. Workstation applications using |
| 830 | ** SQLite normally do not need to invoke either of these routines. |
| 831 | ** |
| 832 | ** A call to sqlite3_initialize() is an "effective" call if it is |
| 833 | ** the first time sqlite3_initialize() is invoked during the lifetime of |
| @@ -2393,11 +2393,11 @@ | |
| 2393 | ** recommended for all new programs. The two older interfaces are retained |
| 2394 | ** for backwards compatibility, but their use is discouraged. |
| 2395 | ** In the "v2" interfaces, the prepared statement |
| 2396 | ** that is returned (the [sqlite3_stmt] object) contains a copy of the |
| 2397 | ** original SQL text. This causes the [sqlite3_step()] interface to |
| 2398 | ** behave differently in three ways: |
| 2399 | ** |
| 2400 | ** <ol> |
| 2401 | ** <li> |
| 2402 | ** If the database schema changes, instead of returning [SQLITE_SCHEMA] as it |
| 2403 | ** always used to do, [sqlite3_step()] will automatically recompile the SQL |
| 2404 |