From: drh <drh@noemail.net>
Date: Fri, 1 Nov 2013 17:21:29 +0000 (+0000)
Subject: Merge all changes from trunk, and disable a pair of corruption tests that are
X-Git-Tag: version-3.8.2~137^2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1aae39cd26867c4da53d10e166d79ce357361517;p=thirdparty%2Fsqlite.git

Merge all changes from trunk, and disable a pair of corruption tests that are
no longer valid since sqlite_master.rootpage can now be NULL for tables.

FossilOrigin-Name: dd5d57b9a1b25fb6c9e20024e519b58630cf1fd0
---

1aae39cd26867c4da53d10e166d79ce357361517
diff --cc manifest
index 6a9c5d36ba,67d073cdb6..9f0bb38ca4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Change\sthe\sinterface\sto\ssqlite3GenerateConstraintChecks()\sfor\simproved\slucidity\nand\sto\sfix\sissues\sin\sdealing\swith\sUPDATEs\sfor\sWITHOUT\sROWID\stables.\s\sMake\ssure\niDataCur\sand\siIdxCur\sare\sinitialized\swhen\sprocessing\sDELETEs\sof\sa\sVIEW.\nUPDATE\sprocessing\sdistinguishes\sbetween\schanges\sto\sROWID\sand\sPRIMARY\sKEY.
- D 2013-11-01T17:08:56.112
 -C Fix\sa\sproblem\sin\sos_unix.c\scausing\scompilation\sfailure\sif\sSQLITE_DEBUG\sand\sSQLITE_MAX_MMAP_SIZE=0\sare\sboth\sdefined.
 -D 2013-10-31T18:49:58.493
++C Merge\sall\schanges\sfrom\strunk,\sand\sdisable\sa\spair\sof\scorruption\stests\sthat\sare\nno\slonger\svalid\ssince\ssqlite_master.rootpage\scan\snow\sbe\sNULL\sfor\stables.
++D 2013-11-01T17:21:29.771
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -212,14 -212,14 +212,14 @@@ F src/parse.y 073a8294e1826f1b1656e8480
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c a467393909a4ed7ca9de066d85ba5c5b04a5be63
 -F src/pragma.c 6fb3125fff078cd81db0039ac778948df4e8cb6f
 -F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
 +F src/pragma.c ff1a98998d2038bc9c770326986b7c4728de4973
 +F src/prepare.c ea231a8450eef356490b09481db9fe51a6a59c32
  F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
  F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
 -F src/resolve.c 572585a96bf282bb9c3d9e08785ec3cae21dc488
 +F src/resolve.c e729889b2c7a680ba4aa7296efa72c09369956d8
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 -F src/select.c 15127b54cc11defb2cddef6914e1f384501a61c4
 +F src/select.c 8290456f2a516abaf8cbbed5e61944d3082e497e
- F src/shell.c d5eebdc6034014103de2b9d58e1d3f6f7de0fb50
+ F src/shell.c 03d8d9b4052430343ff30d646334621f980f1202
  F src/sqlite.h.in 547a44dd4ff4d975e92a645ea2d609e543a83d0f
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@@ -387,7 -387,7 +387,7 @@@ F test/colname.test 08948a4809d22817e0e
  F test/conflict.test 0b3922d2304a14a47e3ccd61bbd6824327af659b
  F test/contrib01.test 2a1cbc0f2f48955d7d073f725765da6fbceda6b4
  F test/corrupt.test 4aabd06cff3fe759e3e658bcc17b71789710665e
--F test/corrupt2.test 9c0ab4becd50e9050bc1ebb8675456a4e5587bf0
++F test/corrupt2.test b8174976fab5bc000e58539ceb3bb9f31b4813f8
  F test/corrupt3.test 889d7cdb811800303aa722d7813fe8a4299cf726
  F test/corrupt4.test b963f9e01e0f92d15c76fb0747876fd4b96dc30a
  F test/corrupt5.test c23da7bfb20917cc7fdbb13ee25c7cc4e9fffeff
@@@ -1076,10 -1075,9 +1076,10 @@@ F test/wherelimit.test 5e9fd41e79bb2b2d
  F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
  F test/win32lock.test 7a6bd73a5dcdee39b5bb93e92395e1773a194361
  F test/win32longpath.test e2aafc07e6990fe86c69be22a3d1a0e210cd329b
 +F test/without_rowid1.test ad5764bbe2784a91f7106143e7d1bd8ccfb61ffd
  F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
  F test/zerodamage.test 209d7ed441f44cc5299e4ebffbef06fd5aabfefd
- F tool/build-all-msvc.bat 38623a30fd58288fda5cc7f7df2682aaab75c9d5 x
+ F tool/build-all-msvc.bat 1bac6adc3fdb4d9204f21d17b14be25778370e48 x
  F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
  F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
  F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@@ -1128,7 -1126,7 +1128,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 3bed599e74d354bf1513e4fb0e8665376ba44d0b
- R 67b4771869ffd7159304bf29f7d68635
 -P 0414bb73ef83332bec3d06471d431690356dbe13
 -R 10dc38d378b39c081f52d9ea4434ffc9
 -U dan
 -Z f097b706b4798a5e46296317a11afe2d
++P c525ac5630d6bcd51842cfc84f2c2c50be9cec1c 090db8c81d8ca216277d11c8c4751c0a37801524
++R 29f428af34633f43240a60101a70dc64
 +U drh
- Z f06e68ba1ad92e0ce7abe5fdcd557daa
++Z c404b4cfe0d89cb06bbfd0f6d2a5b5d1
diff --cc manifest.uuid
index 765f0dea3a,fdc44fddfb..58c8eac1d4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c525ac5630d6bcd51842cfc84f2c2c50be9cec1c
 -090db8c81d8ca216277d11c8c4751c0a37801524
++dd5d57b9a1b25fb6c9e20024e519b58630cf1fd0
diff --cc test/corrupt2.test
index 744a76ed04,744a76ed04..f395a0ba91
--- a/test/corrupt2.test
+++ b/test/corrupt2.test
@@@ -466,6 -466,6 +466,11 @@@ corruption_test -sqlprep 
    } {1 {database disk image is malformed}}
  }
  
++# Since the introduction of WITHOUT ROWID tables, having a table entry in
++# the sqlite_master table with a NULL rootpage is no longer a sign of 
++# corruption.
++#
++if 0 {
  corruption_test -sqlprep {
    CREATE TABLE t1(a, b, c);
    CREATE TABLE t2(a, b, c);
@@@ -479,6 -479,6 +484,7 @@@
      sqlite3_errcode db
    } {SQLITE_CORRUPT}
  }
++} ;# Disabled rootpage==NULL corruption test
  
  corruption_test -sqlprep {
    PRAGMA auto_vacuum = incremental;