diff options
| author | drh <> | 2025-02-27 15:55:01 +0000 |
|---|---|---|
| committer | drh <> | 2025-02-27 15:55:01 +0000 |
| commit | 157d9276a0f0fa64ea9fc5e947d71294d035b708 (patch) | |
| tree | 45ab2045408111ef10fe804b4e9f5b2452575638 /src | |
| parent | 94c42564f370b597b0665e8b89a738cf58a6aa4f (diff) | |
| parent | 29820d39d8a78501687b0930295d298f95442d69 (diff) | |
| download | sqlite-157d9276a0f0fa64ea9fc5e947d71294d035b708.tar.gz sqlite-157d9276a0f0fa64ea9fc5e947d71294d035b708.zip | |
Merge back a sequence of three changes that were branched due to a build break.
FossilOrigin-Name: 67809715977a5bad0ec7830e27746aba2080852eb725d471c0fd62d4f464a884
Diffstat (limited to 'src')
| -rw-r--r-- | src/func.c | 2 | ||||
| -rw-r--r-- | src/main.c | 8 | ||||
| -rw-r--r-- | src/util.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/func.c b/src/func.c index d8c812759..9e2839336 100644 --- a/src/func.c +++ b/src/func.c @@ -1919,7 +1919,7 @@ static void kahanBabuskaNeumaierInit( ** that it returns NULL if it sums over no inputs. TOTAL returns ** 0.0 in that case. In addition, TOTAL always returns a float where ** SUM might return an integer if it never encounters a floating point -** value. TOTAL never fails, but SUM might through an exception if +** value. TOTAL never fails, but SUM might throw an exception if ** it overflows an integer. */ static void sumStep(sqlite3_context *context, int argc, sqlite3_value **argv){ diff --git a/src/main.c b/src/main.c index 4d981d0ce..ba2faf0b7 100644 --- a/src/main.c +++ b/src/main.c @@ -303,6 +303,14 @@ int sqlite3_initialize(void){ if( rc==SQLITE_OK ){ sqlite3PCacheBufferSetup( sqlite3GlobalConfig.pPage, sqlite3GlobalConfig.szPage, sqlite3GlobalConfig.nPage); +#ifdef SQLITE_EXTRA_INIT_MUTEXED + { + int SQLITE_EXTRA_INIT_MUTEXED(const char*); + rc = SQLITE_EXTRA_INIT_MUTEXED(0); + } +#endif + } + if( rc==SQLITE_OK ){ sqlite3MemoryBarrier(); sqlite3GlobalConfig.isInit = 1; #ifdef SQLITE_EXTRA_INIT diff --git a/src/util.c b/src/util.c index 703ef0a23..8e4fd516e 100644 --- a/src/util.c +++ b/src/util.c @@ -1639,7 +1639,7 @@ int sqlite3MulInt64(i64 *pA, i64 iB){ } /* -** Compute the absolute value of a 32-bit signed integer, of possible. Or +** Compute the absolute value of a 32-bit signed integer, if possible. Or ** if the integer has a value of -2147483648, return +2147483647 */ int sqlite3AbsInt32(int x){ |