cvs: php4 /ext/mysql php_mysql.c
| From: | Rasmus Lerdorf | Date: | Fri, 12 Jan 2001 08:03:24 +0000 |
| Subject: | cvs: php4 /ext/mysql php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3562@lists.php.net to get a copy of this message | ||
rasmus Fri Jan 12 00:03:24 2001 EDT
Modified files:
/php4/ext/mysql php_mysql.c
Log:
Fix for bug 6073 from Sean R. Bright <elixer@erols.com>
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.61 php4/ext/mysql/php_mysql.c:1.62
--- php4/ext/mysql/php_mysql.c:1.61 Sat Dec 2 09:27:11 2000
+++ php4/ext/mysql/php_mysql.c Fri Jan 12 00:03:24 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.61 2000/12/02 17:27:11 zeev Exp $ */
+/* $Id: php_mysql.c,v 1.62 2001/01/12 08:03:24 rasmus Exp $ */
/* TODO:
@@ -73,6 +73,10 @@
# 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 @@
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: