diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-16 11:22:43 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-16 11:22:43 +0200 |
| commit | f684553c2cc6f717447f1bbd69b09ebcd6973dfa (patch) | |
| tree | af84ff9a8ca4a44dcd4ee336f0acb0391645b1be /ext/mysqli/mysqli_nonapi.c | |
| parent | 0a2fd0db3cb57a567954c55e6607cf2102eb91ce (diff) | |
| parent | a1c1736bfb88d006542dc9bcc10d7101617517a6 (diff) | |
| download | php-git-f684553c2cc6f717447f1bbd69b09ebcd6973dfa.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix MySQL local infile / attr handling on big endian systems
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index e3f64ae275..e8b1e34875 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -330,8 +330,8 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne #if !defined(MYSQLI_USE_MYSQLND) mysql->mysql->reconnect = MyG(reconnect); #endif - - mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&MyG(allow_local_infile)); + unsigned int allow_local_infile = MyG(allow_local_infile); + mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&allow_local_infile); end: if (!mysqli_resource) { |