From: shearer <shearer@noemail.net>
Date: Thu, 24 Sep 2020 06:37:18 +0000 (+0000)
Subject: Group metadata definitions together
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=153fa608bf9dbefbde9b01cdf276322e5ae1eefd;p=thirdparty%2Fsqlite.git

Group metadata definitions together

FossilOrigin-Name: 5c306f42514a42fce40fddbfed83df71c3897cc36843ed4e9e968de85ec80b42
---

diff --git a/manifest b/manifest
index 4d5618755f..ab4e930c00 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 B 3d35fa0be866213274fc09250225b345f6b08a9b4ec373d53d95e627e24512be
-C Figured\sout\swhere/how\ssqlite3BtreeRowCountEst()\sis\scalled
-D 2020-09-23T17:31:30.742
-F src/btree.h a52b132ac5812afd3c894ec64a3313162734d4ed765a5c12bab671ddf016969b
-P ab53b317953c07c12970e530efda0ce39fa259dc29be980c1aa4784dcf9a39fb
-R 9819f6c7f8b826627bd979a42816ba96
+C Group\smetadata\sdefinitions\stogether
+D 2020-09-24T06:37:18.043
+F src/btree.h a36f07d3b2a654293b477d80d6f0eff2ce2420dcf964c857eaa44980f1a15a6d
+P a46537153c0db06a324320fb5fb1a6aa5191a7559b6d1cabfa6bf4b9457b3bae
+R abf43f37689908b171be03d573437689
 U shearer
-Z d1230908241e48c6115d197b68156142
+Z 9e6a3a5c88466f17b17373b213cb5ea0
diff --git a/manifest.uuid b/manifest.uuid
index d4e560e827..23567e8818 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a46537153c0db06a324320fb5fb1a6aa5191a7559b6d1cabfa6bf4b9457b3bae
\ No newline at end of file
+5c306f42514a42fce40fddbfed83df71c3897cc36843ed4e9e968de85ec80b42
\ No newline at end of file
diff --git a/src/btree.h b/src/btree.h
index daf8559c72..03a9c61aeb 100644
--- a/src/btree.h
+++ b/src/btree.h
@@ -32,11 +32,6 @@
 #ifndef SQLITE_BTREE_H
 #define SQLITE_BTREE_H
 
-/* TODO: This definition is just included so other modules compile. It
-** needs to be revisited.
-*/
-#define SQLITE_N_BTREE_META 16
-
 /*
 ** Forward declarations of structure
 */
@@ -457,6 +452,13 @@ int sqlite3BtreeIncrVacuum(Btree *);
 #define BTREE_DATA_VERSION        15  /* A virtual meta-value */
 
 
+/* TODO: This definition is only used in asserts to determine whether 
+ * the metadata index (second parameter of Get/UpdateMeta functions) 
+ * is out of range. It is only included here so other modules compile. It
+ * ** needs to be revisited.
+ * */
+#define SQLITE_N_BTREE_META 16
+
 void sqlite3BtreeGetMeta(Btree *pBtree, int idx, u32 *pValue);
 int sqlite3BtreeUpdateMeta(Btree*, int idx, u32 value);