com php-src: fix bug #48724: ext/pdo_mysql/mysql_statement .c
| From: | Stanislav Malyshev | Date: | Mon, 17 Jun 2013 07:27:21 +0000 |
| Subject: | com php-src: fix bug #48724: ext/pdo_mysql/mysql_statement .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72405@lists.php.net to get a copy of this message | ||
Commit: 95cc763a1484c4922f6577c10de937299dc8c8e0
Author: Antony Dovgal <tony@daylessday.org> Fri, 13 Apr 2012 13:59:52 +0400
Committer: Stanislav Malyshev <stas@php.net> Mon, 17 Jun 2013 00:27:21 -0700
Parents: 248414f132534c6fa99a94ebc69a7cfd88f8c443
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=95cc763a1484c4922f6577c10de937299dc8c8e0
Log:
fix bug #48724
PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
Bugs:
https://bugs.php.net/48724
Changed paths:
M ext/pdo_mysql/mysql_statement.c
Diff:
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
index 2ae5595..369c389 100644
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
@@ -761,9 +761,12 @@ static char *type_to_name_native(int type) /* {{{ */
switch (type) {
PDO_MYSQL_NATIVE_TYPE_NAME(STRING)
PDO_MYSQL_NATIVE_TYPE_NAME(VAR_STRING)
-#ifdef MYSQL_HAS_TINY
+#ifdef FIELD_TYPE_TINY
PDO_MYSQL_NATIVE_TYPE_NAME(TINY)
#endif
+#ifdef FIELD_TYPE_BIT
+ PDO_MYSQL_NATIVE_TYPE_NAME(BIT)
+#endif
PDO_MYSQL_NATIVE_TYPE_NAME(SHORT)
PDO_MYSQL_NATIVE_TYPE_NAME(LONG)
PDO_MYSQL_NATIVE_TYPE_NAME(LONGLONG)
@@ -778,7 +781,7 @@ static char *type_to_name_native(int type) /* {{{ */
PDO_MYSQL_NATIVE_TYPE_NAME(GEOMETRY)
#endif
PDO_MYSQL_NATIVE_TYPE_NAME(TIMESTAMP)
-#ifdef MYSQL_HAS_YEAR
+#ifdef FIELD_TYPE_YEAR
PDO_MYSQL_NATIVE_TYPE_NAME(YEAR)
#endif
PDO_MYSQL_NATIVE_TYPE_NAME(SET)