diff options
author | mistachkin <mistachkin@noemail.net> | 2014-03-05 01:29:18 +0000 |
---|---|---|
committer | mistachkin <mistachkin@noemail.net> | 2014-03-05 01:29:18 +0000 |
commit | afc14f72ef54b9f983ca16a96da85cf6aee40b7f (patch) | |
tree | 5669825bbe4db27ed84f14f4fc086d645dcf1986 /src/vdbeapi.c | |
parent | 19c6d96aec7545d5c8723c48bde5089a8f89a5c7 (diff) | |
download | sqlite-afc14f72ef54b9f983ca16a96da85cf6aee40b7f.tar.gz sqlite-afc14f72ef54b9f983ca16a96da85cf6aee40b7f.zip |
Experimental simplification of memory flags/type handling.
FossilOrigin-Name: bac2820e13a79d91d0f8938c643134a9d6900327
Diffstat (limited to 'src/vdbeapi.c')
-rw-r--r-- | src/vdbeapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vdbeapi.c b/src/vdbeapi.c index c1edbe48e..4c9d4870d 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -206,7 +206,7 @@ int sqlite3_value_type(sqlite3_value* pVal){ SQLITE_INTEGER, /* 0x1e */ SQLITE_NULL, /* 0x1f */ }; - return aType[pVal->memType&0x1f]; + return aType[pVal->flags&MEM_AffMask]; } /**************************** sqlite3_result_ ******************************* @@ -758,7 +758,7 @@ static Mem *columnMem(sqlite3_stmt *pStmt, int i){ #if defined(SQLITE_DEBUG) && defined(__GNUC__) __attribute__((aligned(8))) #endif - = {0, "", (double)0, {0}, 0, MEM_Null, SQLITE_NULL, 0, + = {0, "", (double)0, {0}, 0, MEM_Null, 0, #ifdef SQLITE_DEBUG 0, 0, /* pScopyFrom, pFiller */ #endif |