diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-20 10:02:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-20 10:02:32 +0200 |
| commit | 9d1c7f8b13956410aa1dcbc5888e1368b6fbbf07 (patch) | |
| tree | 36043cd0acd8ca5ac6c7484a7ec5ba53678e767b /ext/mysqli | |
| parent | f23164584ec145895e3f086c8c23c5e443fb1472 (diff) | |
| parent | a7544411dfb833331a19ff10c1082428d80d2ad7 (diff) | |
| download | php-git-9d1c7f8b13956410aa1dcbc5888e1368b6fbbf07.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix mysqli build with mysqlnd and without PDO
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 604c83884e..0e30f5783f 100644 --- 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 |