diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-12-05 13:20:53 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-12-05 13:20:53 +0000 |
| commit | 39c135b1c4f0435afbb39f0fe9634270be6cfadb (patch) | |
| tree | 2c4e4401c920b123e0092be9fd9ae4c1650314b0 | |
| parent | 7aaff40de5a1dd73186bc4e13dcf10ae2dbf3313 (diff) | |
| download | php-git-39c135b1c4f0435afbb39f0fe9634270be6cfadb.tar.gz | |
MF51:
fix #35536 (mysql_field_type() doesn't handle NEWDECIMAL)
add also SET, ENUM, NEWDATE and GEOMETRY to the switch
| -rw-r--r-- | ext/mysql/php_mysql.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index a15986607e..c5fd4d3995 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -2175,6 +2175,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: @@ -2186,11 +2189,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; |