summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2004-08-26 22:47:34 +0400
committerkonstantin@mysql.com <>2004-08-26 22:47:34 +0400
commit46f1922fb5b60bec1e6be2fec6622679a47144cc (patch)
tree1de1516ae5d9cf4fed01d62d562f719d9902f173 /libmysql
parente876d6f4dacc26d77c517907b768638379596709 (diff)
downloadmariadb-git-46f1922fb5b60bec1e6be2fec6622679a47144cc.tar.gz
A short fix and test case for Bug#5126
"Mediumint and PS problem": just treat mediumint as long.
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index e9961ed11e3..380e53d7d47 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -3339,6 +3339,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value,
}
case MYSQL_TYPE_DATE:
case MYSQL_TYPE_DATETIME:
+ case MYSQL_TYPE_TIMESTAMP:
{
MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
str_to_datetime(value, length, tm, 0, &err);
@@ -3612,6 +3613,7 @@ static void fetch_result_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
length= 2;
break;
}
+ case MYSQL_TYPE_INT24: /* mediumint is sent as 4 bytes int */
case MYSQL_TYPE_LONG:
{
long value= sint4korr(*row);