PHP mysqlnd svn commit: r717 - trunk/php6/ext/mysql

Author: ahristov
Date: 2007-07-11 17:28:34 +0200 (Wed, 11 Jul 2007) New Revision: 717

Modified:

   trunk/php6/ext/mysql/php_mysql.c
Log:
Let it compile with old libmysql, 4.1 versions

Modified: trunk/php6/ext/mysql/php_mysql.c

• trunk/php6/ext/mysql/php_mysql.c 2007-07-11 15:12:48 UTC (rev 716) +++ trunk/php6/ext/mysql/php_mysql.c 2007-07-11 15:28:34 UTC (rev 717) @@ -1969,11 +1969,21 @@

 #define MYSQL_BINARY_CHARSET_NR 63  

+#if MYSQL_VERSION_ID > 50002 || defined(HAVE_MYSQLND)
+/* we have BIT */
 #define IS_BINARY_DATA(f) (((f)->type == MYSQL_TYPE_TINY_BLOB || (f)->type == MYSQL_TYPE_BLOB || \

 	(f)->type == MYSQL_TYPE_MEDIUM_BLOB || (f)->type == MYSQL_TYPE_LONG_BLOB || \
-	(f)->type == MYSQL_TYPE_BIT || (f)->type == MYSQL_TYPE_VAR_STRING || \
-	(f)->type == MYSQL_TYPE_VARCHAR || (f)->type == MYSQL_TYPE_STRING)&& (f)->charsetnr == MYSQL_BINARY_CHARSET_NR)
+	(f)->type == MYSQL_TYPE_BIT || \
+	(f)->type == MYSQL_TYPE_VAR_STRING || (f)->type == MYSQL_TYPE_VARCHAR || \
+	(f)->type == MYSQL_TYPE_STRING)&& (f)->charsetnr == MYSQL_BINARY_CHARSET_NR)

+	(f)->type == MYSQL_TYPE_MEDIUM_BLOB || (f)->type == MYSQL_TYPE_LONG_BLOB || \
+	(f)->type == MYSQL_TYPE_VAR_STRING || \ (f)->type == MYSQL_TYPE_VARCHAR || \
+	(f)->type == MYSQL_TYPE_STRING)&& (f)->charsetnr == MYSQL_BINARY_CHARSET_NR)
 

+#endif

+
 /* {{{ php_mysql_fetch_hash
  */
 static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, int expected_args, int into_object)

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com