summaryrefslogtreecommitdiffstats
path: root/libmysqld/libmysql.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 13:39:13 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 13:39:13 +0000
commit86fbb58c3ac0865482819c10a3e81f2eea001c36 (patch)
tree28c9e526ea739c6f9b89e36115e1e2698bddf981 /libmysqld/libmysql.c
parentReleasing progress-linux version 1:10.11.6-2~progress7.99u1. (diff)
downloadmariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.tar.xz
mariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.zip
Merging upstream version 1:10.11.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--libmysqld/libmysql.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
index 7f55b0c2..07926763 100644
--- a/libmysqld/libmysql.c
+++ b/libmysqld/libmysql.c
@@ -3229,7 +3229,8 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, size_t
{
longlong data= my_strtoll10(value, &endptr, &err);
*param->error= (IS_TRUNCATED(data, param->is_unsigned,
- INT_MIN32, INT_MAX32, UINT_MAX32) || err > 0);
+ (longlong) INT_MIN32, (longlong) INT_MAX32,
+ (longlong) UINT_MAX32) || err > 0);
longstore(buffer, (int32) data);
break;
}
@@ -3346,7 +3347,8 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
break;
case MYSQL_TYPE_LONG:
*param->error= IS_TRUNCATED(value, param->is_unsigned,
- INT_MIN32, INT_MAX32, UINT_MAX32);
+ (longlong) INT_MIN32, (longlong) INT_MAX32,
+ (longlong) UINT_MAX32);
longstore(buffer, (int32) value);
break;
case MYSQL_TYPE_LONGLONG: