diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-24 12:23:08 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-24 12:23:37 +0200 |
commit | 555e7eccc4f2391046b76caeb8219904f092f843 (patch) | |
tree | c6e1b10e03e8483fe66d073ee4d5eb61bb68d7fc /ext/odbc/odbc.stub.php | |
parent | c25b5c64d17f17d8af195747363586f360c2c6b3 (diff) | |
parent | 901d02200152492d6292b418bb35e80084d5d140 (diff) | |
download | php-git-555e7eccc4f2391046b76caeb8219904f092f843.tar.gz |
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #78470: odbc_specialcolumns() no longer accepts $nullable
Diffstat (limited to 'ext/odbc/odbc.stub.php')
-rw-r--r-- | ext/odbc/odbc.stub.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/odbc/odbc.stub.php b/ext/odbc/odbc.stub.php index 9316f1d7e4..36d8ad6dc7 100644 --- a/ext/odbc/odbc.stub.php +++ b/ext/odbc/odbc.stub.php @@ -174,7 +174,7 @@ function odbc_foreignkeys($connection_id, ?string $pk_qualifier, string $pk_owne * @param resource $connection_id * @return resource|false */ -function odbc_specialcolumns($connection_id, int $type, ?string $qualifier, string $owner, string $table, int $scope) {} +function odbc_specialcolumns($connection_id, int $type, ?string $qualifier, string $owner, string $table, int $scope, int $nullable) {} /** * @param resource $connection_id |