From: drh <drh@noemail.net>
Date: Sat, 8 Dec 2012 13:26:23 +0000 (+0000)
Subject: Fix the header comment on the OP_Compare operator.
X-Git-Tag: version-3.7.15~7^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ca10dfbed25fd2dd3af1820b6d298724064b55b;p=thirdparty%2Fsqlite.git

Fix the header comment on the OP_Compare operator.

FossilOrigin-Name: 2722f4074fd8d189b7bd2b9107484b66500e5e9b
---

diff --git a/manifest b/manifest
index 0a0208befc..0b6849349f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Duplicating\scheck\sconstraint\sexpressions\sprior\sto\scode\sgeneration\sis\sno\nlonger\srequired,\sand\sso\sit\sis\sremoved.
-D 2012-12-08T04:10:44.860
+C Fix\sthe\sheader\scomment\son\sthe\sOP_Compare\soperator.
+D 2012-12-08T13:26:23.206
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -237,7 +237,7 @@ F src/update.c 28d2d098b43a2c70dae399896ea8a02f622410ef
 F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
 F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
 F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
-F src/vdbe.c 328cb259ca182026ff63d78a005821339a17ba09
+F src/vdbe.c 89138e8e8b5468f349ace581db9c49801f4d6543
 F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 F src/vdbeInt.h 79abf9b31be406d35ca77d6999cb2d42aaf91e78
 F src/vdbeapi.c 4c2418161cf45392ba76a7ca92f9a5f06b96f89c
@@ -1025,7 +1025,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 7b96115e81deab0aa0472839cf787ba3f2fc64a7
-R 8013579f53b80064be673dd6b756f3d9
+P 1a9db8dc2f3c5cb089801d56122cdf5c3a618163
+R e3c2d38c5b1c04086085015686938bf6
 U drh
-Z 116d2ac1551cc67be301e91dcf07c1f6
+Z 5f1846a0c26a9b369fef13111cb44cf8
diff --git a/manifest.uuid b/manifest.uuid
index 150b22cf8e..1fd44ee6bb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a9db8dc2f3c5cb089801d56122cdf5c3a618163
\ No newline at end of file
+2722f4074fd8d189b7bd2b9107484b66500e5e9b
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 6b78d27fd8..454993f5f1 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1909,6 +1909,11 @@ case OP_Permutation: {
 ** vector "A") and in reg(P2)..reg(P2+P3-1) ("B").  Save the result of
 ** the comparison for use by the next OP_Jump instruct.
 **
+** If P5 has the OPFLAG_PERMUTE bit set, then the order of comparison is
+** determined by the most recent OP_Permutation operator.  If the
+** OPFLAG_PERMUTE bit is clear, then register are compared in sequential
+** order.
+**
 ** P4 is a KeyInfo structure that defines collating sequences and sort
 ** orders for the comparison.  The permutation applies to registers
 ** only.  The KeyInfo elements are used sequentially.