From: drh Date: Thu, 25 Apr 2013 16:52:19 +0000 (+0000) Subject: Merge the std-ext branch into trunk. This merge adds several new extensions X-Git-Tag: version-3.7.17~55 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c140a6b40def2f1edf3abf485eef1205a7fe1043;p=thirdparty%2Fsqlite.git Merge the std-ext branch into trunk. This merge adds several new extensions to the ext/misc folder, including transitive_closure, ieee754, and amatch, and it convers some older src/test_*.c file into extensions in the ext/misc folder. FossilOrigin-Name: bbe607c7d17c50b667990360e2ccfab8dd22f161 --- c140a6b40def2f1edf3abf485eef1205a7fe1043 diff --cc manifest index 31cc673a2f,1e2aa91074..89fc7d396e --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Make\ssure\sthe\saffinity\sand\sdatatype\sof\ssub-subqueries\sare\sinitialized\nprior\sto\ssubqueries\sas\sthe\slatter\srelies\son\sthe\sformer. - D 2013-04-25T00:57:10.497 -C Added\sthe\stransitive_closure,\sieee754,\sand\samatch\sextensions. -D 2013-04-25T16:42:55.478 ++C Merge\sthe\sstd-ext\sbranch\sinto\strunk.\s\sThis\smerge\sadds\sseveral\snew\sextensions\nto\sthe\sext/misc\sfolder,\sincluding\stransitive_closure,\sieee754,\sand\samatch,\nand\sit\sconvers\ssome\solder\ssrc/test_*.c\sfile\sinto\sextensions\sin\sthe\sext/misc\nfolder. ++D 2013-04-25T16:52:19.390 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 87591ea5bf7d6ed521ad42d5bc69c124debe11a5 + F Makefile.in 38a45083d4df568eefd31d27d67381850f35a016 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc 67d9db478186d7d4a498c794fff049f7231a9626 + F Makefile.msc d03cde9073d5752d6ddcaa6807a8bdda277e48f2 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa @@@ -83,6 -83,13 +83,13 @@@ F ext/fts3/unicode/mkunicode.tcl 7a9bc0 F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43 F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37 + F ext/misc/amatch.c 3369b2b544066e620d986f0085d039c77d1ef17f + F ext/misc/closure.c fec0c8537c69843e0b7631d500a14c0527962cd6 -F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f ++F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f w src/test_fuzzer.c + F ext/misc/ieee754.c 2565ce373d842977efe0922dc50b8a41b3289556 -F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0 -F ext/misc/spellfix.c 8bb699116e36cc5e68d7ddf1810b638a3090c744 -F ext/misc/wholenumber.c ce362368b9381ea48cbd951ade8df867eeeab014 ++F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0 w src/test_regexp.c ++F ext/misc/spellfix.c 8bb699116e36cc5e68d7ddf1810b638a3090c744 w src/test_spellfix.c ++F ext/misc/wholenumber.c ce362368b9381ea48cbd951ade8df867eeeab014 w src/test_wholenumber.c F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 F ext/rtree/rtree.c 757abea591d4ff67c0ff4e8f9776aeda86b18c14 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e @@@ -179,10 -186,10 +186,10 @@@ F src/pragma.c 3eacf001cbf4becbd494f8d8 F src/prepare.c 743e484233c51109666d402f470523553b41797c F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 -F src/resolve.c 10a1b332e3eb36e5d561085e18c58a8578cd7d73 +F src/resolve.c 83cc2d942ee216bc56956c6e6fadb691c1727fa1 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 -F src/select.c 01540bcd3df3c8f1187158e77986028b1c667258 +F src/select.c 6bfbe11e2fef81c5e18d30513ab6c69f171667eb - F src/shell.c aca9d94653decd4496846dee0c7ba83eaf96a46d + F src/shell.c 5d527e5d08f05ec2c43ff194ea44bf62b974f4c9 F src/sqlite.h.in ec279b782bea05db63b8b29481f9642b406004af F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0 F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5 @@@ -258,9 -261,9 +261,9 @@@ F src/vdbetrace.c 3ad1b4e92b60c082a02ac F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887 -F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b +F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73 F src/where.c d54e63087b52c309550aa2defdb20ef27add9f9a - F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823 + F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87 @@@ -1054,7 -1058,7 +1058,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac - P f136bd95824dc95b9e6acdc4d55db263ba13fbaa - R 35e39801836ac191fc1f292f3b81674a -P de556add10150140981a2e34b3712e96a7c262e3 -R 9481b1895542c76cd21821bef5dac0b1 ++P 39b4e6ff9316cc78ea88349091e195b8104d1e9e 84018099c8715b982cd24ce9221f93c7379e8c08 ++R dffac967ebf5545ada46cf15534fed7e U drh - Z 424df927045edc37db2bc00e1032f86c -Z 540c4ff1b6a2b03d38328f53c71b1af7 ++Z d8995ab3eecb48f05ff755314fd194c9 diff --cc manifest.uuid index 4aeba6cd08,31b1041913..33791ed9df --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 39b4e6ff9316cc78ea88349091e195b8104d1e9e -84018099c8715b982cd24ce9221f93c7379e8c08 ++bbe607c7d17c50b667990360e2ccfab8dd22f161