Change the REGEXP function in ICU to require exactly 2 arguments.

FossilOrigin-Name: c34cf23efb92d9bbb7cf4245d372e47182771f63

diff --git a/ext/icu/icu.c b/ext/icu/icu.c
index c673341aa5e692aa44527897e590206901672e87..e99f1424b553057a781d86a0c9d7bd156aa657ca 100644 (file)
--- a/ext/icu/icu.c
+++ b/ext/icu/icu.c
@@ -454,7 +454,7 @@ int sqlite3IcuInit(sqlite3 *db){
     void *pContext;                           /* sqlite3_user_data() context */
     void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
   } scalars[] = {
-    {"regexp",-1, SQLITE_ANY,          0, icuRegexpFunc},
+    {"regexp", 2, SQLITE_ANY,          0, icuRegexpFunc},
 
     {"lower",  1, SQLITE_UTF16,        0, icuCaseFunc16},
     {"lower",  2, SQLITE_UTF16,        0, icuCaseFunc16},

diff --git a/manifest b/manifest
index 3a17aa593b450882f0c7e695e7373b64a697ea76..eac300cd5490cd8645716ef8193b2914dbe62bd1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Remove\sunreachable\scode\sthat\swas\sadded\sby\sthe\sfix\sto\sthe\s"(xANDy)OR(z)"\sbug\nin\sthe\sprevious\scheck-in.
-D 2009-12-16T23:43:55
+C Change\sthe\sREGEXP\sfunction\sin\sICU\sto\srequire\sexactly\s2\sarguments.
+D 2009-12-17T02:13:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -74,7 +74,7 @@ F ext/fts3/fts3_tokenizer1.c 11a604a53cff5e8c28882727bf794e5252e5227b
 F ext/fts3/fts3_write.c 2847b13da9e00016b81ea4b80ff5a298e55bc32d
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33
-F ext/icu/icu.c 12e763d288d23b5a49de37caa30737b971a2f1e2
+F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/rtree.c 038d59b05783c2e6c927a7352bb118a76c31065a
@@ -783,14 +783,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 2c2de252666662f5459904fc33a9f2956cbff23c
-R 788e421365d0e76ba399b58405f069c0
+P 04915562a0c2cb377bc7baa0c06c5d9ac376563c
+R 8fb010f89df986bb1e3ccf9081bc395d
 U drh
-Z ec1d76d017fc8850fea3e2efadea4e03
+Z b03333e958abdafc178e2111c7dc045a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLKXC+oxKgR168RlERArULAJ9EXPN/43YX+xLi4kYmaBI16MocVQCfd57b
-3yY4D6DwpXWJCHus3nTzzCU=
-=FeSr
+iD8DBQFLKZPXoxKgR168RlERAv/4AJ4rJeu5eLBQAd7P5tYFnbl0kiFyfgCfQO/J
+s4cvcIV5qeUoZkP9mmgyLCU=
+=i/Ub
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 8a33e8224272eebce8fda05abddaea00faea417d..4e743cbafbad1ed013b218ec224e1858e0acbbdc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-04915562a0c2cb377bc7baa0c06c5d9ac376563c
\ No newline at end of file
+c34cf23efb92d9bbb7cf4245d372e47182771f63
\ No newline at end of file