From: Sean Bright <elixer@php.net>
Date: Wed, 31 Jan 2001 00:55:28 +0000 (+0000)
Subject: Fix for bug #8991.  mysql_field_type() now returns "year" for columns of
X-Git-Tag: php-4.0.5RC1~431
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4086ba977301614c64e386d27774b9f8731bceca;p=php

Fix for bug #8991.  mysql_field_type() now returns "year" for columns of
type YEAR.
---

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index a6ae675709..3f4a31694e 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -77,6 +77,10 @@ static int le_result, le_link, le_plink;
 #define MYSQL_HAS_TINY
 #endif
 
+#if MYSQL_VERSION_ID > 32200
+#define MYSQL_HAS_YEAR
+#endif
+
 #define MYSQL_ASSOC		1<<0
 #define MYSQL_NUM		1<<1
 #define MYSQL_BOTH		(MYSQL_ASSOC|MYSQL_NUM)
@@ -1549,6 +1553,11 @@ static char *php_mysql_get_field_name(int field_type)
 		case FIELD_TYPE_TIMESTAMP:
 			return "timestamp";
 			break;
+#ifdef MYSQL_HAS_YEAR
+		case FIELD_TYPE_YEAR:
+			return "year";
+			break;
+#endif
 		case FIELD_TYPE_DATE:
 			return "date";
 			break;