Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix test for pdo_odbc

diff --cc ext/pdo/tests/bug_65946.phpt
index 76a4e8db89e430a57e001189f67a02b88681bc2f,0c9d6ac00b8954b94377e83c90cc4431d3f3d72d..931842891085d32386b14d35aee80f64586e58ac
--- 1/ext/pdo/tests/bug_65946.phpt
--- 2/ext/pdo/tests/bug_65946.phpt
+++ b/ext/pdo/tests/bug_65946.phpt
@@@ -18,8 -18,13 +18,11 @@@ $db->exec('CREATE TABLE test(id int)')
  $db->exec('INSERT INTO test VALUES(1)');
  switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
        case 'dblib':
 -              // if :limit is used, the value will be quoted as '1', which is invalid syntax
 -              // this is a bug, to be addressed separately from adding these tests to pdo_dblib
 -              $sql = 'SELECT TOP 1 * FROM test';
 +              $sql = 'SELECT TOP :limit * FROM test';
                break;
+       case 'odbc':
+               $sql = 'SELECT TOP (:limit) * FROM test';
+               break;
        case 'firebird':
                $sql = 'SELECT FIRST :limit * FROM test';
                break;