Merge branch 'ob-10.0' into 10.0

701af14b · Olivier Bertrand · b520febb · 4efcc35a · 701af14b
Commit 701af14b authored Jul 28, 2015 by Olivier Bertrand
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/connect/jsonudf.cpp storage/connect/jsonudf.cpp +1 -1

No files found.
--- a/storage/connect/jsonudf.cpp
+++ b/storage/connect/jsonudf.cpp
@@ -261,7 +261,7 @@ static PJVAL MakeValue(PGLOBAL g, UDF_ARGS *args, int i)
      break;
    case INT_RESULT:
-      jvp->SetInteger(g, *(int*)sap);
+      jvp->SetInteger(g, (int)*(long long*)sap);
      break;
    case REAL_RESULT:
      jvp->SetFloat(g, *(double*)sap);