Import mysqlnd

Patch ext/mysql and ext/mysqli to support mysqlnd

1 files changed, 33 insertions, 5 deletions

diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32
index 789112ea14..0f418f0cba 100644
--- a/ext/mysqli/config.w32
+++ b/ext/mysqli/config.w32
@@ -1,14 +1,42 @@
 // $Id$
 // vim:ft=javascript
 
+// Note: The extension name is "mysqli", you enable it with "--with-mysqli".
+// Passing value "mysqlnd" to it enables the bundled
+// client library to connect to the MySQL server, i.e. no external MySQL
+// client library is needed to perform the build.
+
 ARG_WITH("mysqli", "MySQLi support", "no");
 
 if (PHP_MYSQLI != "no") {
-	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.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c mysqli_fe.c mysqli_report.c mysqli_repl.c mysqli_driver.c mysqli_warning.c mysqli_exception.c mysqli_embedded.c");
-		AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+	mysqli_source =
+		"mysqli.c " +
+		"mysqli_api.c " +
+		"mysqli_driver.c " +
+		"mysqli_embedded.c " +
+		"mysqli_exception.c " +
+		"mysqli_fe.c " +
+		"mysqli_nonapi.c " +
+		"mysqli_prop.c " +
+		"mysqli_report.c " +
+		"mysqli_warning.c";
+
+	if (PHP_MYSQLI != "mysqlnd") {
+		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)) {
+			// No "mysqli_repl.c" when using "mysqlnd"
+			mysqli_extra_sources = "mysqli_repl.c";
+			EXTENSION("mysqli", mysqli_source + " " + mysqli_extra_sources);
+			AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+		} else {
+			WARNING("mysqli not enabled; libraries and headers not found");
+		}
 	} else {
-		WARNING("mysqli not enabled; libraries and headers not found");
+		EXTENSION("mysqli", mysqli_source);
+		AC_DEFINE('HAVE_MYSQLND', 1, 'MySQLi with native driver support enabled');
+		AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+		ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
 	}
 }