From: dan <dan@noemail.net>
Date: Sat, 21 Mar 2015 12:25:23 +0000 (+0000)
Subject: Remove an unreachable branch from the OP_VCreate opcode (merge accidental fork in... 
X-Git-Tag: version-3.8.9~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4e0fd26e3fad8124dd51a1ee1dc6e6286eff5a0;p=thirdparty%2Fsqlite.git

Remove an unreachable branch from the OP_VCreate opcode (merge accidental fork in trunk).

FossilOrigin-Name: 2fbfec62fc03d42ee240dfefaa0aeb59a3f04d88
---

b4e0fd26e3fad8124dd51a1ee1dc6e6286eff5a0
diff --cc manifest
index b682535cbf,05da0070b5..75771530bb
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\san\sinteger\soverflow\sin\sfts3\scausing\sgcc\s4.7.1\swith\s-O2\sto\sbehave\scounter-intuitively\s(perhaps\sbecause\sthe\sbehaviour\sis\sundefined).\sAdd\san\s"ifcapable\strace"\sto\sa\stest\sin\sshell4.test.
- D 2015-03-21T12:22:51.140
 -C Remove\san\sunreachable\sbranch\sfrom\sthe\sOP_VCreate\sopcode.
 -D 2015-03-21T12:22:16.937
++C Remove\san\sunreachable\sbranch\sfrom\sthe\sOP_VCreate\sopcode\s(merge\saccidental\sfork\sin\strunk).
++D 2015-03-21T12:25:23.115
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1246,7 -1246,7 +1246,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
--P d845b0f69093178517d66e1fc5060e8f62c681c7
- R 7a07a789329b4f516d02a691b70e458c
 -R 33e37ff5951445c194f8f62b65ec1d8a
 -U drh
 -Z f47a30263eba86ab7824497d08f8b218
++P e3e234649616f20610abce9ae9da1c572d3a4377 5fca41a3811766b48f5f23d5d49cc4e6e79fa867
++R f330fb6722b7e402dae00a81353077df
 +U dan
- Z 3ae65dad7900f82b42a270fbfd21fd80
++Z 1c256b7cca05bea8c4676944e04ddeb4
diff --cc manifest.uuid
index 2e8412f795,9d0d2f5b15..d71396b19d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e3e234649616f20610abce9ae9da1c572d3a4377
 -5fca41a3811766b48f5f23d5d49cc4e6e79fa867
++2fbfec62fc03d42ee240dfefaa0aeb59a3f04d88