database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-10-21 11:13:54 +03:00
Code Activity

Merge updates from trunk.

Browse Source 
FossilOrigin-Name: ffc6e682836cdf275189427109f8af2aeb423bcd
This commit is contained in:
mistachkin
2013-08-28 18:56:04 +00:00
parent 98ab33a82f e4f9b9b7c0
commit 312404ef76
70 changed files with 3571 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/func.c
View File

@@ -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
}