diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-28 12:56:00 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-28 12:56:00 +0100 |
| commit | ca8e2abb8e21b65a762815504d1fb3f20b7b45bc (patch) | |
| tree | c19dc934b9aaa946ef59fa4fe1ea49f5a9df50b8 /ext/mysqli/mysqli.c | |
| parent | 9abb47155f31e26994fcb475be5e894eccedf1f5 (diff) | |
| parent | 7be0e06b482e5bf14eaf4fe9a882d8b72d644038 (diff) | |
| download | php-git-ca8e2abb8e21b65a762815504d1fb3f20b7b45bc.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 62cf098658..61d97b2a9b 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -525,11 +525,7 @@ static PHP_GINIT_FUNCTION(mysqli) mysqli_globals->report_mode = 0; mysqli_globals->report_ht = 0; mysqli_globals->allow_local_infile = 0; -#ifdef HAVE_EMBEDDED_MYSQLI - mysqli_globals->embedded = 1; -#else mysqli_globals->embedded = 0; -#endif mysqli_globals->rollback_on_cached_plink = FALSE; } /* }}} */ |