summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorram@gw.mysql.r18.ru <>2004-12-10 20:07:00 +0400
committerram@gw.mysql.r18.ru <>2004-12-10 20:07:00 +0400
commit41a509ba863b162c9c1abaf80e9f9c18316c80d2 (patch)
tree9e79f632eb221c433fa95d8eae5415776a896164 /libmysql
parent536702f4c527efe79f07c5bffe297718cc594942 (diff)
downloadmariadb-git-41a509ba863b162c9c1abaf80e9f9c18316c80d2.tar.gz
A fix (bug #7129: Test failure: 'type_ranges' when using '--ps-protocol'
bug #7126: Test failure: 'func_str' when using '--ps-protocol' bug #7130: Test failure: 'type_uint' when using '--ps-protocol').
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 99fa0299de9..8989dc18fd7 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -3663,8 +3663,8 @@ static void fetch_result_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
case MYSQL_TYPE_INT24: /* mediumint is sent as 4 bytes int */
case MYSQL_TYPE_LONG:
{
- long value= sint4korr(*row);
- longlong data= field_is_unsigned ? (longlong) (unsigned long) value :
+ int32 value= sint4korr(*row);
+ longlong data= field_is_unsigned ? (longlong) (uint32) value :
(longlong) value;
fetch_long_with_conversion(param, field, data);
*row+= 4;