diff options
| author | mistachkin <mistachkin@noemail.net> | 2013-08-28 18:56:04 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2013-08-28 18:56:04 +0000 |
| commit | 312404ef766bb3378f60f1befc39ef0663e682f2 (patch) | |
| tree | f8a2d33198976e095df08a0bf5f160f16633b7ee /src/func.c | |
| parent | 98ab33a82f131056bd428fe547fbec74999fb34a (diff) | |
| parent | e4f9b9b7c0245818bd1e227950209305a7d2f9e2 (diff) | |
| download | sqlite-312404ef766bb3378f60f1befc39ef0663e682f2.tar.gz sqlite-312404ef766bb3378f60f1befc39ef0663e682f2.zip | |
Merge updates from trunk.
FossilOrigin-Name: ffc6e682836cdf275189427109f8af2aeb423bcd
Diffstat (limited to 'src/func.c')
| -rw-r--r-- | src/func.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/func.c b/src/func.c index db8176046..658559ba4 100644 --- a/src/func.c +++ b/src/func.c @@ -1614,9 +1614,9 @@ static void groupConcatFinalize(sqlite3_context *context){ StrAccum *pAccum; pAccum = sqlite3_aggregate_context(context, 0); if( pAccum ){ - if( pAccum->tooBig ){ + if( pAccum->accError==STRACCUM_TOOBIG ){ sqlite3_result_error_toobig(context); - }else if( pAccum->mallocFailed ){ + }else if( pAccum->accError==STRACCUM_NOMEM ){ sqlite3_result_error_nomem(context); }else{ sqlite3_result_text(context, sqlite3StrAccumFinish(pAccum), -1, @@ -1809,4 +1809,7 @@ void sqlite3RegisterGlobalFunctions(void){ #ifndef SQLITE_OMIT_ALTERTABLE sqlite3AlterFunctions(); #endif +#if defined(SQLITE_ENABLE_STAT3) || defined(SQLITE_ENABLE_STAT4) + sqlite3AnalyzeFunctions(); +#endif } |