diff options
author | drh <drh@noemail.net> | 2014-04-03 16:35:33 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2014-04-03 16:35:33 +0000 |
commit | 652cc4b6dca02426e8d375a962bf8417850d9f7a (patch) | |
tree | adf8a096e1a149ccc67872577712eb3837dbdd39 /src/sqliteInt.h | |
parent | 24ed9d04452fa500ed8d0be277bfffe156d75696 (diff) | |
parent | c438df1be06f636ef68265f083aff4af95d326e6 (diff) | |
download | sqlite-652cc4b6dca02426e8d375a962bf8417850d9f7a.tar.gz sqlite-652cc4b6dca02426e8d375a962bf8417850d9f7a.zip |
Merge all recent changes from trunk,
including the fix for the OP_SCopy-vs-OP_Copy problem.
FossilOrigin-Name: 9515c8344a6743bbb0c6a6e49fb79fb3139090df
Diffstat (limited to 'src/sqliteInt.h')
-rw-r--r-- | src/sqliteInt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 683df99ac..cbbdc2b60 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1635,6 +1635,7 @@ struct UnpackedRecord { KeyInfo *pKeyInfo; /* Collation and sort-order information */ u16 nField; /* Number of entries in apMem[] */ i8 default_rc; /* Comparison result if keys are equal */ + u8 isCorrupt; /* Corruption detected by xRecordCompare() */ Mem *aMem; /* Values */ int r1; /* Value to return if (lhs > rhs) */ int r2; /* Value to return if (rhs < lhs) */ |