From ab34dafb69eb516dd9a0340f5ddbdd7251036447 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Mon, 5 Dec 2005 13:16:48 +0000 Subject: fix #35536 (mysql_field_type() doesn't handle NEWDECIMAL) add also SET, ENUM, NEWDATE and GEOMETRY to the switch --- ext/mysql/php_mysql.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 9c2a70b06e..84e83758c0 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -2188,6 +2188,9 @@ static char *php_mysql_get_field_name(int field_type) case FIELD_TYPE_FLOAT: case FIELD_TYPE_DOUBLE: case FIELD_TYPE_DECIMAL: +#ifdef FIELD_TYPE_NEWDECIMAL + case FIELD_TYPE_NEWDECIMAL: +#endif return "real"; break; case FIELD_TYPE_TIMESTAMP: @@ -2199,11 +2202,25 @@ static char *php_mysql_get_field_name(int field_type) break; #endif case FIELD_TYPE_DATE: +#ifdef FIELD_TYPE_NEWDATE + case FIELD_TYPE_NEWDATE: +#endif return "date"; break; case FIELD_TYPE_TIME: return "time"; break; + case FIELD_TYPE_SET: + return "set"; + break; + case FIELD_TYPE_ENUM: + return "enum"; + break; +#ifdef FIELD_TYPE_GEOMETRY + case FIELD_TYPE_GEOMETRY: + return "geometry"; + break; +#endif case FIELD_TYPE_DATETIME: return "datetime"; break; -- cgit v1.2.1