Skip to content

Remove libmysql support from mysqli #7889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 30, 2022
Merged

Remove libmysql support from mysqli #7889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b93fbc
Remove libmysql
kamil-tekiela Jan 5, 2022
a9e1d85
Remove MYSQLI_USE_MYSQLND constant and all the code with it
kamil-tekiela Jan 5, 2022
be3d55d
The INI mysqli.reconnect directive has been removed.
kamil-tekiela Feb 6, 2022
80e56d6
Remove mysqli_driver::$reconnect property
kamil-tekiela Feb 13, 2022
2b509b2
Remove tests for libmysql
kamil-tekiela Feb 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions ext/mysqli/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [

PHP_ARG_WITH([mysqli],
[for MySQLi support],
[AS_HELP_STRING([[--with-mysqli[=FILE]]],
[Include MySQLi support. FILE is the path to mysql_config. If no value or
mysqlnd is passed as FILE, the MySQL native driver will be used])])
[AS_HELP_STRING([[--with-mysqli]],
[Include MySQLi support. The MySQL native driver will be used])])

dnl ext/pdo_mysql/config.m4 also depends on this configure option.
PHP_ARG_WITH([mysql-sock],
Expand All @@ -45,20 +44,7 @@ if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
PHP_MYSQLND_ENABLED=yes

elif test "$PHP_MYSQLI" != "no"; then

MYSQL_CONFIG=$PHP_MYSQLI

if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG --libs > /dev/null 2>&1; then
MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
MYSQLI_LIBLINE=`$MYSQL_CONFIG --libs | $SED -e "s/'//g"`
else
AC_MSG_RESULT([mysql_config not found])
AC_MSG_ERROR([Please reinstall the mysql distribution])
fi

PHP_EVAL_INCLINE($MYSQLI_INCLINE)
PHP_EVAL_LIBLINE($MYSQLI_LIBLINE, MYSQLI_SHARED_LIBADD)
AC_DEFINE(HAVE_MYSQLILIB, 1, [ ])
AC_MSG_ERROR([Linking mysqli against external library is no longer supported])
fi

dnl Build extension
Expand All @@ -83,9 +69,6 @@ if test "$PHP_MYSQLI" != "no"; then

if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd)
AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
PHP_INSTALL_HEADERS([ext/mysqli/mysqli_mysqlnd.h])
else
PHP_INSTALL_HEADERS([ext/mysqli/mysqli_libmysql.h])
fi
fi
18 changes: 1 addition & 17 deletions ext/mysqli/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,9 @@ if (PHP_MYSQLI != "no") {
"mysqli_report.c " +
"mysqli_warning.c";

if (PHP_MYSQLI == "yes" || PHP_MYSQLI == "mysqlnd") {
if (PHP_MYSQLI != "no") {
EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'Using MySQL native driver');
AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
MESSAGE("\tmysqlnd build");
PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h");
} else {
if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) &&
CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI +
"\\include;" + PHP_PHP_BUILD +
"\\include\\mysql;" + PHP_MYSQLI)) {
EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
MESSAGE("\tlibmysql build");
PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h");
} else {
WARNING("mysqli not enabled; libraries and headers not found");
PHP_MYSQLI = "no"
}
}
}
Loading