tony2001 Mon Dec 5 08:20:18 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/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/NEWS?r1=1.1247.2.920.2.91&r2=1.1247.2.920.2.92&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.91 php-src/NEWS:1.1247.2.920.2.92
--- php-src/NEWS:1.1247.2.920.2.91 Sun Dec 4 12:32:26 2005
+++ php-src/NEWS Mon Dec 5 08:20:17 2005
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, Version 4.4.2
+- FIxed bug #35536 (mysql_field_type() doesn't handle NEWDECIMAL). (Tony)
- Fixed bug #35410 (wddx_deserialize() doesn't handle large ints as keys
properly). (Ilia)
- Fixed bug #35341 (Fix for bug #33760 breaks build with older curl). (Tony)
http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.174.2.29&r2=1.174.2.29.2.1&ty=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.174.2.29
php-src/ext/mysql/php_mysql.c:1.174.2.29.2.1
--- php-src/ext/mysql/php_mysql.c:1.174.2.29 Thu Apr 7 18:23:01 2005
+++ php-src/ext/mysql/php_mysql.c Mon Dec 5 08:20:18 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.174.2.29 2005/04/07 22:23:01 sniper Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.29.2.1 2005/12/05 13:20:18 tony2001 Exp $ */
/* TODO:
*
@@ -2088,6 +2088,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:
@@ -2099,11 +2102,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
