summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2001-01-12 08:03:24 +0000
committerRasmus Lerdorf <rasmus@php.net>2001-01-12 08:03:24 +0000
commit69d16ee1f9c2a2b6f019a1ea9242edd68290d18d (patch)
tree17dd2f179ae31b4c655d8889a1d0164222432de5 /ext/mysql/php_mysql.c
parentb208f6bc7d14c3e0e7d715880c505f4ad3099469 (diff)
downloadphp-git-69d16ee1f9c2a2b6f019a1ea9242edd68290d18d.tar.gz
Fix for bug 6073 from Sean R. Bright <elixer@erols.com>
Diffstat (limited to 'ext/mysql/php_mysql.c')
-rw-r--r--ext/mysql/php_mysql.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 7ffa996459..5e6e64e448 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -73,6 +73,10 @@ static int le_result, le_link, le_plink;
# endif
#endif
+#if MYSQL_VERSION_ID > 32133 || defined(FIELD_TYPE_TINY)
+#define MYSQL_HAS_TINY
+#endif
+
#define MYSQL_ASSOC 1<<0
#define MYSQL_NUM 1<<1
#define MYSQL_BOTH (MYSQL_ASSOC|MYSQL_NUM)
@@ -1528,7 +1532,7 @@ static char *php_mysql_get_field_name(int field_type)
case FIELD_TYPE_VAR_STRING:
return "string";
break;
-#ifdef FIELD_TYPE_TINY
+#ifdef MYSQL_HAS_TINY
case FIELD_TYPE_TINY:
#endif
case FIELD_TYPE_SHORT: