From: drh <drh@noemail.net>
Date: Mon, 25 Aug 2014 22:43:17 +0000 (+0000)
Subject: Merge the CAST operator enhancements from trunk.
X-Git-Tag: version-3.8.7~132^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c4ec84256b48ec243b991fbe8d419abfa345025;p=thirdparty%2Fsqlite.git

Merge the CAST operator enhancements from trunk.

FossilOrigin-Name: 6c8f86e4e08d5d57e21496277613e0f9dcc06514
---

6c4ec84256b48ec243b991fbe8d419abfa345025
diff --cc manifest
index 22dd6d848a,a75c4cd6f7..84d67d6062
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Query\sor\schange\sthe\smaximum\snumber\sof\sworker\sthreads\sallowed\son\seach\ndatabase\sconnection\sseparately\susing\sthe\s"PRAGMA\sthreads"\scommand.
- D 2014-08-25T15:13:22.455
 -C Add\san\sassert()\sand\sfive\stestcase()\smacros\sto\sthe\sOP_Cast\sopcode\simplementation\nto\shelp\sverify\sthat\sit\sis\sfully\stested.
 -D 2014-08-25T22:37:19.150
++C Merge\sthe\sCAST\soperator\senhancements\sfrom\strunk.
++D 2014-08-25T22:43:17.516
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
@@@ -285,14 -284,14 +285,14 @@@ F src/update.c ea336ce7b8b3fc5e316ba8f0
  F src/utf.c 77abb5e6d27f3d236e50f7c8fff1d00e15262359
  F src/util.c 068dcd26354a3898ccc64ad5c4bdb95a7a15d33a
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 93cf510b8e59df5fffcc4a9de9bef9c046979ab1
 -F src/vdbe.c 2f8fbc520cac2f5bacc43de2aeed6a4880c9cb57
++F src/vdbe.c 5d6a6ad63227dfd444d13b3391272b20d1a76100
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
- F src/vdbeInt.h 94f5cb24803285c8b29026f55b5e05ac69232ce5
 -F src/vdbeInt.h df58400454823954cfb241e5858f07f37fc1fd78
++F src/vdbeInt.h a1fcc0a04445c5d797694dc860a906010b9be7e6
  F src/vdbeapi.c cda974083d7597f807640d344ffcf76d872201ce
 -F src/vdbeaux.c dba006f67c9fd1b1d07ee7fb0fb38aa1905161d1
 +F src/vdbeaux.c cef5d34a64ae3a65b56d96d3fd663246ec8e1c36
  F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
- F src/vdbemem.c 4c9d686da474957d2e78834f13cc5f141fe6b87f
+ F src/vdbemem.c 4e08ea087aea367dae7c45129b75487e0056e819
 -F src/vdbesort.c f7f5563bf7d4695ca8f3203f3bf9de96d04ed0b3
 +F src/vdbesort.c 3a76f51efdf0790fd3d26afabdd81e0a21f52ae7
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
  F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
@@@ -1193,7 -1188,7 +1193,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 dfdc900f5d1a31ee5c5f35a630c4a8253e69093b
- R 4c161b4070e5a7022237a28172d6e331
 -P 1ad70ec550c004160d9c0c57e6c416812cdead5e
 -R b751a4133861a7b502aa405ba96eea49
++P 29c5e8a7c9d7ce349a1e1d72082d23450e877b45 af364cce9da0961593ef876b646197f82df08ad5
++R c7c8cecd9a8ffa9d596fa5137e696964
  U drh
- Z 1c68bfb86ec54e7d60991aea6df8a67a
 -Z 0bd8a75e39f468a6e4b9b4599a579487
++Z 1d9d719c4b1a959a79787aab5421ad60
diff --cc manifest.uuid
index 645cc6429f,c36f309914..25b89b4eae
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 29c5e8a7c9d7ce349a1e1d72082d23450e877b45
 -af364cce9da0961593ef876b646197f82df08ad5
++6c8f86e4e08d5d57e21496277613e0f9dcc06514