tony2001 Mon Dec 5 08:19:44 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.1760.2.524&r2=1.1760.2.525&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.524 php-src/NEWS:1.1760.2.525
--- php-src/NEWS:1.1760.2.524 Thu Dec 1 07:56:01 2005
+++ php-src/NEWS Mon Dec 5 08:19:42 2005
@@ -4,6 +4,7 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number > field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- FIxed bug #35536 (mysql_field_type() doesn't handle NEWDECIMAL). (Tony)
- Fixed bug #35437 (Segfault or Invalid Opcode 137/1/4). (Dmitry)
- Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
soapenc:base64binary fails). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.209.2.2&r2=1.209.2.3&ty=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.209.2.2
php-src/ext/mysql/php_mysql.c:1.209.2.3
--- php-src/ext/mysql/php_mysql.c:1.209.2.2 Thu Apr 7 18:23:28 2005
+++ php-src/ext/mysql/php_mysql.c Mon Dec 5 08:19:43 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.209.2.2 2005/04/07 22:23:28 sniper Exp $ */
+/* $Id: php_mysql.c,v 1.209.2.3 2005/12/05 13:19:43 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
