List of MATCH operator names in isMatchOfColumn() should be constant.

FossilOrigin-Name: 7319d676aaf95ba7391379f4cdf193b6aa898893

diff --git a/manifest b/manifest
index 5d7ed0ac6835861b24d62c70aa8f0781a3b2fc85..d87a893d493ed30c4b2075268128a7ebcdcde9a1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\senhancement\sin\sthe\sexpression\swalker.
-D 2016-08-10T18:56:32.070
+C List\sof\sMATCH\soperator\snames\sin\sisMatchOfColumn()\sshould\sbe\sconstant.
+D 2016-08-10T19:43:29.424
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -467,7 +467,7 @@ F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09
 F src/where.c 5c9df42d50888be8274a5a0eb062eb0629869bd3
 F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
-F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
+F src/whereexpr.c 600e6c619d69f5455dd99c69fec8c42ac44e5c9d
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1510,7 +1510,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 059f4e2efefb7b9deaf539110c19bceaeb10c6ce
-R e10ecf5680d55c2be7b6807b82221bef
+P ebccbd96094ac64de39dbd0d220d3a7afd8cd40e
+R fac33bc7c9b64529fad9a6567bc0fbba
 U drh
-Z 07228f4a19a0e884d96dc70fff71df0f
+Z d9cf90e53680d487c9bbc0ab8247d4aa

diff --git a/manifest.uuid b/manifest.uuid
index 821d79b57b1515103d2fe021cd5c6b02988a8a5b..1286c1b8bf0e377d3541296cdb2e4cc1706c660e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ebccbd96094ac64de39dbd0d220d3a7afd8cd40e
\ No newline at end of file
+7319d676aaf95ba7391379f4cdf193b6aa898893
\ No newline at end of file

diff --git a/src/whereexpr.c b/src/whereexpr.c
index 1cb6be845854bb560621e7853a9a8735b86dea5d..2461d1ddf82ed64b87fb96f249a42643ffd8e1d8 100644 (file)
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -290,7 +290,7 @@ static int isMatchOfColumn(
   Expr *pExpr,                    /* Test this expression */
   unsigned char *peOp2            /* OUT: 0 for MATCH, or else an op2 value */
 ){
-  struct Op2 {
+  static const struct Op2 {
     const char *zOp;
     unsigned char eOp2;
   } aOp[] = {