From: drh <drh@noemail.net>
Date: Tue, 29 Nov 2011 15:04:12 +0000 (+0000)
Subject: Remove unused boolean fields from the UnpackedRecord object.
X-Git-Tag: mountain-lion~9^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76a3acaceabe44df8a403fc4ae1e1cfd62a108f0;p=thirdparty%2Fsqlite.git

Remove unused boolean fields from the UnpackedRecord object.

FossilOrigin-Name: b10d091ec02e94643e865743129e2a21147b3136
---

diff --git a/manifest b/manifest
index 57f6d38fc4..ebb20702cf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Removed\sthe\sunused\s"type"\sfield\sfrom\sthe\sCollSeq\s(collating\ssequence)\sobject.
-D 2011-11-29T14:46:56.791
+C Remove\sunused\sboolean\sfields\sfrom\sthe\sUnpackedRecord\sobject.
+D 2011-11-29T15:04:12.252
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -184,7 +184,7 @@ F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
 F src/shell.c 29812a900a780eb0f835c4bc65e216272689def8
 F src/sqlite.h.in 57081d8e6b53ce29541d7437c93bce6087ac53b5
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
-F src/sqliteInt.h f49fb4fdcbb771f0b20b0b19f5590bab1dcfbf0d
+F src/sqliteInt.h bbc4c0b01e3499a9d30750c91718217c26688afb
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -976,7 +976,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P ed0151ba8379a6c95304c9a8f9fe47e741fb80a3
-R 13b41fa72e4f9a2a4e116535aca5d91c
+P ab89b047e82efdf59ed91a38b5195341a3743cbf
+R beca209612bf2507bfd744deef578dc8
 U drh
-Z 68de038f6dc2b2eb4d0dfd2d0418c9e2
+Z 97f245e9e22cbbc849b128b1b8b18545
diff --git a/manifest.uuid b/manifest.uuid
index 33713fc17c..269eaa8b60 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ab89b047e82efdf59ed91a38b5195341a3743cbf
\ No newline at end of file
+b10d091ec02e94643e865743129e2a21147b3136
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 48884aa85f..856e878628 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1434,7 +1434,7 @@ struct KeyInfo {
 struct UnpackedRecord {
   KeyInfo *pKeyInfo;  /* Collation and sort-order information */
   u16 nField;         /* Number of entries in apMem[] */
-  u16 flags;          /* Boolean settings.  UNPACKED_... below */
+  u8 flags;           /* Boolean settings.  UNPACKED_... below */
   i64 rowid;          /* Used by UNPACKED_PREFIX_SEARCH */
   Mem *aMem;          /* Values */
 };
@@ -1442,11 +1442,9 @@ struct UnpackedRecord {
 /*
 ** Allowed values of UnpackedRecord.flags
 */
-#define UNPACKED_NEED_FREE     0x0001  /* Memory is from sqlite3Malloc() */
-#define UNPACKED_NEED_DESTROY  0x0002  /* apMem[]s should all be destroyed */
-#define UNPACKED_INCRKEY       0x0008  /* Make this key an epsilon larger */
-#define UNPACKED_PREFIX_MATCH  0x0010  /* A prefix match is considered OK */
-#define UNPACKED_PREFIX_SEARCH 0x0020  /* A prefix match is considered OK */
+#define UNPACKED_INCRKEY       0x01  /* Make this key an epsilon larger */
+#define UNPACKED_PREFIX_MATCH  0x02  /* A prefix match is considered OK */
+#define UNPACKED_PREFIX_SEARCH 0x04  /* Ignore final (rowid) field */
 
 /*
 ** Each SQL index is represented in memory by an