From: drh <drh@noemail.net>
Date: Wed, 22 Feb 2017 19:49:54 +0000 (+0000)
Subject: Merge integrity_check and other improvements from trunk.
X-Git-Tag: version-3.18.0~81^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=114ce7a4b1785a8024b9ccce0b74393685c7ca5c;p=thirdparty%2Fsqlite.git

Merge integrity_check and other improvements from trunk.

FossilOrigin-Name: fe073905081b421405ca425ca03c5b8b0ff5f2c8
---

114ce7a4b1785a8024b9ccce0b74393685c7ca5c
diff --cc manifest
index 1f4c33857e,7980c45c8d..392b3afc29
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sfixes\sfrom\strunk.
- D 2017-02-20T13:11:07.110
 -C Move\sa\sbranch\scondition\sin\sanalyze.c\sinside\san\s#ifdef\sSQLITE_ENABLE_STAT4\sblock.
 -D 2017-02-22T19:41:16.947
++C Merge\sintegrity_check\sand\sother\simprovements\sfrom\strunk.
++D 2017-02-22T19:49:54.795
  F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@@ -331,16 -332,16 +332,16 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
  F src/alter.c 3b23977620ce9662ac54443f65b87ba996e36121
- F src/analyze.c 1b7197d619788353437d390de42a9bccbb4aa2ac
 -F src/analyze.c 8a2af8a16e4d95ec2327d3f180cb0bab4b2074c1
++F src/analyze.c b4857ec5b46b66049e5a3cec53c071c4902a8e8b
  F src/attach.c 8c476f8bd5d2afe11d925f890d30e527e5b0ce43
  F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
 -F src/btree.c 3ae66974881e74df9909093818b4c3428f8d7982
 -F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
 +F src/btree.c a4ab1fb5cdeea88c4f76216e41cfecfa505c8c43
 +F src/btree.h bf64dfeeddeebdb775a5eba0098bbc00d073290d
  F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
- F src/build.c 2e05d0360568f40dc583461f2211f020ff282ee4
 -F src/build.c 51b473eec465f471d607b54e8dbc00751c3f8a1f
++F src/build.c 43f903c9082040ced2b421543cb0300c2973647d
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c a9984df73898c042a5cfc8f9d8e7723d02bc35c9
@@@ -387,8 -388,8 +388,8 @@@ F src/parse.y af8830094f4aecb91cb69721f
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
  F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
- F src/pragma.c 8a35509e8f60746fbdcde5312ddfd177c46c7e9c
 -F src/pragma.c b127edeb54c744a101b371cfa2e221fd741bcd72
 -F src/pragma.h 61aa5389118594bebb28120a6720401aee34ce1a
++F src/pragma.c 97742aae32e645926f6f8fc426169fb5ef97c268
 +F src/pragma.h 065e184494f12e94111da1ab6984faa7b6142e68
  F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
  F src/printf.c 67427bbee66d891fc6f6f5aada857e9cdb368c1c
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
@@@ -399,7 -400,7 +400,7 @@@ F src/shell.c bf976d5301be9d8a4c52852c9
  F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 87857c2b8d8825e22970ce3f466b8618ee55b44e
 -F src/sqliteInt.h a23e18aebdd0d851c2956a74a3a4f12ff202b472
++F src/sqliteInt.h bdc181e371ea618c85f30b4c5ee4d80f4ada6ad7
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -461,7 -462,7 +462,7 @@@ F src/update.c 456d4a4656f8a03c2abc88a5
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
  F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
- F src/vdbe.c 02f9db522c73ba4e1743585e9fd6f8ac6c71515b
 -F src/vdbe.c 83f387d9e6842b1dc99f6e85bb577c5bbc4e397d
++F src/vdbe.c 37e95d52675bd839cc6c209f6b8d907582a27d44
  F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
  F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
  F src/vdbeapi.c 3e4a8893feeb78620f4aac4ac5b85d92255b97e1
@@@ -1557,7 -1557,7 +1558,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e842ad391e62df273a5b1ed569d42ea46d03a99b 491814272dce7e937b4734fcbc2ad69e12377b56
- R 9def7926ef27f77a7e1d535aaff2eb82
 -P 737a82444065752785c643b1d29ca097c828effb
 -R 36d1036d6c004868a4b3899253e892b2
 -U dan
 -Z b9298378d570f055da46d519ad41197c
++P ff213f2ef5bf96754a2264685d25546d8b5ccf0a d6afd98de3ee8b714dfd6477ead955096f623972
++R c12096fa1c0a2878a437d029e47aff9d
 +U drh
- Z ee1e0d41251dc153fd55728fd5740a3d
++Z 3c7beae38049bf1fe67e75122f4d0189
diff --cc manifest.uuid
index 969c5d24f3,69e4a7f8b9..54b7ffb813
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ff213f2ef5bf96754a2264685d25546d8b5ccf0a
 -d6afd98de3ee8b714dfd6477ead955096f623972
++fe073905081b421405ca425ca03c5b8b0ff5f2c8
diff --cc src/sqliteInt.h
index 19c7481223,d9ec8c5bc9..fddfe2a57f
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -1887,8 -1887,8 +1887,9 @@@ struct Table 
  #define TF_WithoutRowid    0x0020    /* No rowid.  PRIMARY KEY is the key */
  #define TF_NoVisibleRowid  0x0040    /* No user-visible "rowid" column */
  #define TF_OOOHidden       0x0080    /* Out-of-Order hidden columns */
 -#define TF_HasNotNull      0x0100    /* Contains NOT NULL constraints */
 -
 +#define TF_StatsUsed       0x0100    /* Query planner decisions affected by
 +                                     ** Index.aiRowLogEst[] values */
++#define TF_HasNotNull      0x0200    /* Contains NOT NULL constraints */
  
  /*
  ** Test to see whether or not a table is a virtual table.  This is