Fix for bug #39085:

PHP6 requires mysqli_set_character_set function which was introduced in
MySQL 4.1.13 and 5.0.7

diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index 2c1af87054a356c0c7564c692772f7f3952ba187..feca0b362642f57a31580e5c34eeab8b1a2b1a7f 100644 (file)
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -49,9 +49,9 @@ dnl  fi
     PHP_EVAL_INCLINE($MYSQLI_INCLINE)
     PHP_EVAL_LIBLINE($MYSQLI_LIBLINE, MYSQLI_SHARED_LIBADD)
     AC_DEFINE(HAVE_MYSQLILIB,1,[ ])
-    PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_stmt_field_count,
+    PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_character_set,
     [ ],[
-               AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.3 (for MySQL 4.1.x) and < 5.0.1 for (MySQL 5.0.x) anymore. Please update your libraries.])
+               AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries.])
        ],[$MYSQLI_LIBLINE])
   ],[
     AC_MSG_ERROR([wrong mysql library version or lib not found. Check config.log for more information.])