MF51:

fix #35536 (mysql_field_type() doesn't handle NEWDECIMAL)
add also SET, ENUM, NEWDATE and GEOMETRY to the switch

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index a15986607ecb7cc6f2bfecb8de686e905d3458da..c5fd4d399574a9d2e8f503efaf26b5aa9200d65c 100644 (file)
--- 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;