tony2001 Mon Dec 5 08:16:51 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysql php_mysql.c
/php-src NEWS
Log:
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.213.2.2&r2=1.213.2.3&ty=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.2
php-src/ext/mysql/php_mysql.c:1.213.2.3
--- php-src/ext/mysql/php_mysql.c:1.213.2.2 Sun Sep 4 13:10:56 2005
+++ php-src/ext/mysql/php_mysql.c Mon Dec 5 08:16:45 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.213.2.2 2005/09/04 17:10:56 wez Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.3 2005/12/05 13:16:45 tony2001 Exp $ */
/* TODO:
*
@@ -2188,6 +2188,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:
@@ -2199,11 +2202,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;
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.273&r2=1.2027.2.274&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.273 php-src/NEWS:1.2027.2.274
--- php-src/NEWS:1.2027.2.273 Mon Dec 5 03:55:57 2005
+++ php-src/NEWS Mon Dec 5 08:16:48 2005
@@ -24,6 +24,7 @@
- Fixed bug #35543 (php crash when calling non existing method of a class
that extends PDO). (Tony)
- Fixed bug #35539 (typo in error message for ErrorException). (Tony)
+- FIxed bug #35536 (mysql_field_type() doesn't handle NEWDECIMAL). (Tony)
- Fixed bug #35509 (string constant as array key has different behavior inside
object). (Dmitry)
- Fixed bug #35508 (PDO fails when unknown fetch mode specified). (Tony)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
