diff options
| author | drh <drh@noemail.net> | 2013-10-10 20:13:18 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-10-10 20:13:18 +0000 |
| commit | a63b85299290b7eca076ea6e031e7f43d4feadcf (patch) | |
| tree | e925eb05965ec76f37b6483581d5bd8f8ea9e53b /src/main.c | |
| parent | 59255f9a98381960cfede9253277f128895531f6 (diff) | |
| parent | 7e65c94bdc689bebd222321dec5c034194267ac9 (diff) | |
| download | sqlite-a63b85299290b7eca076ea6e031e7f43d4feadcf.tar.gz sqlite-a63b85299290b7eca076ea6e031e7f43d4feadcf.zip | |
Synchronize with the trunk.
FossilOrigin-Name: 136445ba020c9475d3f5a7843d7d0add98477138
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index 0ddd700de..a85dfa5eb 100644 --- a/src/main.c +++ b/src/main.c @@ -1406,7 +1406,7 @@ int sqlite3CreateFunc( ** operation to continue but invalidate all precompiled statements. */ p = sqlite3FindFunction(db, zFunctionName, nName, nArg, (u8)enc, 0); - if( p && p->iPrefEnc==enc && p->nArg==nArg ){ + if( p && (p->funcFlags & SQLITE_FUNC_ENCMASK)==enc && p->nArg==nArg ){ if( db->nVdbeActive ){ sqlite3Error(db, SQLITE_BUSY, "unable to delete/modify user-function due to active statements"); @@ -1431,7 +1431,7 @@ int sqlite3CreateFunc( pDestructor->nRef++; } p->pDestructor = pDestructor; - p->flags = 0; + p->funcFlags &= SQLITE_FUNC_ENCMASK; p->xFunc = xFunc; p->xStep = xStep; p->xFinalize = xFinal; |