From: mistachkin Date: Thu, 29 Aug 2013 01:01:11 +0000 (+0000) Subject: Fix boundary case for the toreal() SQL function. X-Git-Tag: version-3.8.1~11^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60883e540122dd38939d9a288c251f204722800e;p=thirdparty%2Fsqlite.git Fix boundary case for the toreal() SQL function. FossilOrigin-Name: abe82c634ccda7d62687df5917d18a9d6e411142 --- diff --git a/manifest b/manifest index e4961822f3..05b0b77188 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\supdates\sfrom\strunk. -D 2013-08-28T18:56:04.093 +C Fix\sboundary\scase\sfor\sthe\storeal()\sSQL\sfunction. +D 2013-08-29T01:01:11.268 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -175,7 +175,7 @@ F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94 F src/expr.c 4d89bd03a04fcdb5ff71d86b4e0cc7d3230797b8 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb -F src/func.c f3ab79a3f46f5c744a14a649d8f4acec30a07cd4 +F src/func.c 6099094d90f401c9fe7ed565d16b6ab07926960e F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4 F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22 @@ -1109,7 +1109,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P 5e1e9fd5e4f189836442baa42244be00de13ff0f 12d0a8859de0a9d823997cfeccc77bd572cb6d13 -R 81e42b2f9c462fbb356fb6a9b3d50e1d +P ffc6e682836cdf275189427109f8af2aeb423bcd +R 5b28ae921fcc930fbdb4ed7973c09a22 U mistachkin -Z a257c970f64b4c0a5f36c110c9d698d7 +Z eee04e7f47bd53db98c6ff93d7e968bb diff --git a/manifest.uuid b/manifest.uuid index 013ba63477..a6f7367f72 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ffc6e682836cdf275189427109f8af2aeb423bcd \ No newline at end of file +abe82c634ccda7d62687df5917d18a9d6e411142 \ No newline at end of file diff --git a/src/func.c b/src/func.c index 658559ba4b..36b0e5f378 100644 --- a/src/func.c +++ b/src/func.c @@ -1030,7 +1030,7 @@ static void torealFunc( case SQLITE_INTEGER: { i64 iVal = sqlite3_value_int64(argv[0]); double rVal = (double)iVal; - if( iVal==rVal ){ + if( iVal==(i64)rVal ){ sqlite3_result_double(context, rVal); } break;