diff --git a/manifest b/manifest index d98cd45916..de6ec8a279 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\sWin32\sthread\shandles\sare\savailable\safter\sthe\sthreads\sexit. -D 2014-07-29T16:37:53.918 +C Fix\sa\sharmless\scompiler\swarning. +D 2014-07-29T17:22:12.808 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -291,7 +291,7 @@ F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949 F src/vdbeaux.c 3f1d2baa4a8cbdad33cb255a5f4fd1af7a414683 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394 -F src/vdbesort.c e78efeed9c87d47d7a09df7d176f3fbf6dcb77e2 +F src/vdbesort.c 48b99b15ac27229a67ed601a711aad1a36cc8631 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a @@ -1189,8 +1189,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f37db3a03d95b508066745613029b7dd1240b31c -Q -2773a5f9879a106a89a3d0bc3c5bfdcb2fe43c7c -R 3e55555e18d084a6f84ef756240b91ed -U mistachkin -Z e9ccfd5ccb7ae9590b75500531d4b897 +P 565c5af7a75ad5c759ce1a61dab3a61c42819644 +R c113c051fb0a0f7ee541f07d792965ad +U drh +Z 1016c6f05046b2d8d5d597484d5273e9 diff --git a/manifest.uuid b/manifest.uuid index ed3eb9f7ff..f715ad6084 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -565c5af7a75ad5c759ce1a61dab3a61c42819644 \ No newline at end of file +216d21d0e62b3c0ad49f3cb395c845bf4f17ac61 \ No newline at end of file diff --git a/src/vdbesort.c b/src/vdbesort.c index e9fa6b456f..96f5b64d57 100644 --- a/src/vdbesort.c +++ b/src/vdbesort.c @@ -1113,7 +1113,7 @@ static void vdbeSorterExtendFile(sqlite3 *db, sqlite3_file *pFd, i64 nByte){ } } #else -# define vdbeSorterExtendFile(x,y,z) SQLITE_OK +# define vdbeSorterExtendFile(x,y,z) #endif /*