]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorGeorge Peter Banyard <girgias@php.net>
Sat, 31 Aug 2019 21:17:21 +0000 (23:17 +0200)
committerGeorge Peter Banyard <girgias@php.net>
Sat, 31 Aug 2019 21:17:21 +0000 (23:17 +0200)
* PHP-7.4:
  Drop E_STRICT notice in mysqli extension

1  2 
ext/mysqli/mysqli_api.c
ext/mysqli/tests/mysqli_more_results.phpt
ext/mysqli/tests/mysqli_multi_query.phpt
ext/mysqli/tests/mysqli_next_result.phpt

Simple merge