summaryrefslogtreecommitdiff
path: root/ext/mysql
diff options
context:
space:
mode:
authorSean Bright <elixer@php.net>2001-01-31 00:55:28 +0000
committerSean Bright <elixer@php.net>2001-01-31 00:55:28 +0000
commit4086ba977301614c64e386d27774b9f8731bceca (patch)
tree89b79533df7c3ea2614b2e0faa60e17fd9749ce6 /ext/mysql
parent2dc33e3e719864d06505b0a67f94c4c27d832f9b (diff)
downloadphp-git-4086ba977301614c64e386d27774b9f8731bceca.tar.gz
Fix for bug #8991. mysql_field_type() now returns "year" for columns of
type YEAR.
Diffstat (limited to 'ext/mysql')
-rw-r--r--ext/mysql/php_mysql.c9
1 files changed, 9 insertions, 0 deletions
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;