Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit 9d1c7f8b1395 · 2020-09-20T10:02:32.000+02:00
* PHP-7.3:
  Fix mysqli build with mysqlnd and without PDO
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
@@ -1941,7 +1941,7 @@ PHP_FUNCTION(mysqli_real_query)
 }
 /* }}} */
 
-#if defined(PDO_USE_MYSQLND) || MYSQL_VERSION_ID < 50707 || defined(MARIADB_BASE_VERSION)
+#if defined(MYSQLI_USE_MYSQLND) || MYSQL_VERSION_ID < 50707 || defined(MARIADB_BASE_VERSION)
 # define mysql_real_escape_string_quote(mysql, to, from, length, quote) \
 	mysql_real_escape_string(mysql, to, from, length)
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1941,7 +1941,7 @@ PHP_FUNCTION(mysqli_real_query)`
`1941`	`1941`	`}`
`1942`	`1942`	`/* }}} */`
`1943`	`1943`
`1944`		`-#if defined(PDO_USE_MYSQLND) \|\| MYSQL_VERSION_ID < 50707 \|\| defined(MARIADB_BASE_VERSION)`
	`1944`	`+#if defined(MYSQLI_USE_MYSQLND) \|\| MYSQL_VERSION_ID < 50707 \|\| defined(MARIADB_BASE_VERSION)`
`1945`	`1945`	`# define mysql_real_escape_string_quote(mysql, to, from, length, quote) \`
`1946`	`1946`	`mysql_real_escape_string(mysql, to, from, length)`
`1947`	`1947`	`#endif`