tony2001 Mon Dec 5 08:20:53 2005 EDT
Modified files:
/php-src/ext/mysql php_mysql.c
Log:
MF51:
fix #35536 (mysql_field_type() doesn't handle NEWDECIMAL)
add also SET, ENUM, NEWDATE and GEOMETRY to the switch
http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.215&r2=1.216&ty=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.215 php-src/ext/mysql/php_mysql.c:1.216
--- php-src/ext/mysql/php_mysql.c:1.215 Fri Aug 12 10:08:22 2005
+++ php-src/ext/mysql/php_mysql.c Mon Dec 5 08:20:53 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.215 2005/08/12 14:08:22 sebastian Exp $ */
+/* $Id: php_mysql.c,v 1.216 2005/12/05 13:20:53 tony2001 Exp $ */
/* TODO:
*
@@ -2175,6 +2175,9 @@
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 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
