summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mysql/php_mysql.c')
-rw-r--r--ext/mysql/php_mysql.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 42229e67e9..cb198be677 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -81,8 +81,13 @@ static int le_result,le_link,le_plink;
#define MYSQL_NUM 1<<1
#define MYSQL_BOTH (MYSQL_ASSOC|MYSQL_NUM)
+#if MYSQL_VERSION_ID < 32224
#define PHP_MYSQL_VALID_RESULT(mysql) \
(mysql_num_fields(mysql)>0)
+#else
+#define PHP_MYSQL_VALID_RESULT(mysql) \
+ (mysql_field_count(mysql)>0)
+#endif
function_entry mysql_functions[] = {
PHP_FE(mysql_connect, NULL)