From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 12 Jan 2001 08:03:24 +0000 (+0000)
Subject: Fix for bug 6073 from Sean R. Bright <elixer@erols.com>
X-Git-Tag: php-4.0.5RC1~619
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69d16ee1f9c2a2b6f019a1ea9242edd68290d18d;p=php

Fix for bug 6073 from Sean R. Bright <elixer@erols.com>
---

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: