From: drh <drh@noemail.net>
Date: Sat, 19 Mar 2016 00:40:06 +0000 (+0000)
Subject: Fix a VDBE register allocation bug exposed by recent enhancements to
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a14dfe465c43be4fa3d66bea205f29827b84c40f;p=thirdparty%2Fsqlite.git

Fix a VDBE register allocation bug exposed by recent enhancements to
PRAGMA integrity_check.

FossilOrigin-Name: c73b5b9ccf3dcf48f403c866423bebbdc45d2b28
---

a14dfe465c43be4fa3d66bea205f29827b84c40f
diff --cc manifest
index befe6f7e88,828c368a4f..2838f638bf
--- a/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Test\scase\stweaks\sto\sbetter\ssupport\sthe\sApple\sconfiguration\soptions.
- D 2016-03-18T11:03:15.004
 -C Fix\sa\sregister\sallocation\sbug\sin\sthe\sVDBE\scode\sgenerator\sfor\nPRAGMA\sintegrity_check;
 -D 2016-03-19T00:35:02.035
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Fix\sa\sVDBE\sregister\sallocation\sbug\sexposed\sby\srecent\senhancements\sto\nPRAGMA\sintegrity_check.
++D 2016-03-19T00:40:06.384
 +F Makefile.in 3aee0ba902634c52493914df76b40cedcd99b678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -345,21 -342,20 +345,21 @@@ F src/pager.h ff4c0c4bdf5e0e1d6a6c00431
  F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
 -F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
 -F src/pragma.c e7e8f380efec6075a722822306435afc1eeca88a
 +F src/pcache1.c dc4ad9b31cf603d14b3a90719f3aa874b4925137
- F src/pragma.c e1e161797d66c604633689f31035bf596b10f58f
++F src/pragma.c 620a6f8c850cc4b42aaa4fcf5ceae531fac027a3
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
 +F src/prepare.c 9c56ea254317e27d3a1273fa812b8578b5e2f850
  F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c 6dd2097bb158efe3b8d68683dcc3b4a49e907a34
  F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
 +F src/sqlite.h.in 427f02cf8a6e461c50f98a8663fd8f582e659456
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h f62754378123246adae7ea1d48de34764ba168b6
 -F src/sqliteInt.h 751ced73be8c449a75e075e0545cdd832ed3591e
++F src/sqliteInt.h d671225a90ee6543ae30ec9d8ae6a8c5d9eebfbc
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -1461,7 -1456,7 +1461,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 ec052b4f14a8a7019bfc1bbe474020abafa557f3
- R 7e30daf73815e9704f232f235223463d
 -P b199637d81d7e2a767131ac03c7679b101fd459c
 -R aa6d8166f4985600b2fe26e199ff3347
++P cb0ffe844c9c3e84cba8c4df90d4d0f2e9f61586 88439a866b3b16ad7c308ebe59198662a05e7eeb
++R dd08a4ca8eff82e32a28be97b544c73d
  U drh
- Z da5133edb23b0fd361e7b2c4a3bb311d
 -Z 34d82988bd3c2eee6ead07b5f4503f1c
++Z e3547d9db7e3a345c6613e4886d1c876
diff --cc manifest.uuid
index 77a4d2ee2d,8f7a7e9b8d..1a4a94eb33
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cb0ffe844c9c3e84cba8c4df90d4d0f2e9f61586
 -88439a866b3b16ad7c308ebe59198662a05e7eeb
++c73b5b9ccf3dcf48f403c866423bebbdc45d2b28