]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Import the sqlite3_analyzer fixes from trunk.
authordrh <drh@noemail.net>
Sat, 2 Nov 2013 11:43:05 +0000 (11:43 +0000)
committerdrh <drh@noemail.net>
Sat, 2 Nov 2013 11:43:05 +0000 (11:43 +0000)
FossilOrigin-Name: ac711459ff243e787ea5e9c01720dff75a5eda9b

1  2 
manifest
manifest.uuid
tool/spaceanal.tcl

diff --cc manifest
index 5cb7b13613fc9395724992afe9290186126bb456,e768e808a90e4a15129f3b818018ec8b053da43e..cd6383f16f530bd86e0da991868e5de9a93fccca
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Size\sKeyInfo\sobjects\sso\sthat\sIdxInserts\salways\scompare\sthe\scorrect\snumber\sof\nfields.
- D 2013-11-01T22:02:56.824
 -C A\spair\sof\ssqlite3_analyzer\sbug\sfixes:\s(1)\squote\sstrings\sin\sthe\sSQL\sat\sthe\send\nof\sthe\soutput.\s(2)\sFix\stest_stat.c\sso\sthat\sit\sno\slonger\smisses\ssome\soverflow\npages\son\sinternal\sindex\spages.
 -D 2013-11-02T11:34:58.851
++C Import\sthe\ssqlite3_analyzer\sfixes\sfrom\strunk.
++D 2013-11-02T11:43:05.572
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1113,7 -1111,7 +1113,7 @@@ F tool/showjournal.c b62cecaab86a4053d9
  F tool/showwal.c 3f7f7da5ec0cba51b1449a75f700493377da57b5
  F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
  F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b
- F tool/spaceanal.tcl 00023972100246743cfdc8b7fb9d7497611c5c0c
 -F tool/spaceanal.tcl 81fad69052145daa3a0a89d47ba69adf52b7aa01
++F tool/spaceanal.tcl 8e50b217c56a6a086a1b47eac9d09c5cd65b996f
  F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355
  F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
  F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
@@@ -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 f9769d701c65770f4b8488f541c59e508393e6c2
- R 71880bd74bc5edec870109286fe9bf00
 -P 090db8c81d8ca216277d11c8c4751c0a37801524
 -R 3b67c293eec6cc448a29f4c028337c5f
++P 302a81390f039fc23eeb8510e95b9d9fa0b41edd 42a11e7464ab1d97d603c7409f10710ad4f1f542
++R 3792eebb99bae3c39c82ab2be948da7e
  U drh
- Z 951dd2ac14cd893ffdc1dceac85de36b
 -Z 034fbe99525e12c2d1270c2b13585d64
++Z 67feff5a16da3f8a7e3efdb5ed709f00
diff --cc manifest.uuid
index 2aaa821acc221b96264a2c82c84c2449f3654e29,095deb42d62c0a3721b4b2c0dc4d5080fe417408..f638e5858c069a3816ea8af4ad53423ec6560d35
@@@ -1,1 -1,1 +1,1 @@@
- 302a81390f039fc23eeb8510e95b9d9fa0b41edd
 -42a11e7464ab1d97d603c7409f10710ad4f1f542
++ac711459ff243e787ea5e9c01720dff75a5eda9b
Simple merge