]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 27 Dec 2019 16:26:42 +0000 (17:26 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 27 Dec 2019 16:26:42 +0000 (17:26 +0100)
* PHP-7.4:
  Don't use PASSWORD() function in test
  Specify explicit row order in PDO MySQL test
  Skip bug77956.phpt if local_infile disabled on server
  Don't check TIMESTAMP NOT NULL in fetch_field_flags test
  Don't test the RENAME DATABASE query
  Make GeomFromText tests compatible with MySQL 8

1  2 
ext/mysqli/tests/bug77956.phpt
ext/mysqli/tests/mysqli_get_client_stats.phpt
ext/mysqli/tests/mysqli_pconn_max_links.phpt

Simple merge