diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-25 09:52:07 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-25 09:52:07 +0100 |
| commit | f06efce38765fa3e7e1cda76039dbe6c51f93778 (patch) | |
| tree | aa0fed313ec49d1246129cd4e82a877a01996b14 | |
| parent | 44ef32ff2cc01d67fefb4e52c5bd29ed5ae3f858 (diff) | |
| parent | 8309c0446411237a1b17d0368e55af921cfb49e8 (diff) | |
| download | php-git-f06efce38765fa3e7e1cda76039dbe6c51f93778.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
mysqlnd pam fix test error message
| -rw-r--r-- | ext/mysqli/tests/mysqli_auth_pam.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/tests/mysqli_auth_pam.phpt b/ext/mysqli/tests/mysqli_auth_pam.phpt index 0c59e25a32..386024598d 100644 --- a/ext/mysqli/tests/mysqli_auth_pam.phpt +++ b/ext/mysqli/tests/mysqli_auth_pam.phpt @@ -101,8 +101,8 @@ max_execution_time=240 require_once('table.inc'); if (!$link = my_mysqli_connect($host, 'pamtest', 'pamtest', $db, $port, $socket)) { - printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", - $host, $user, $db, $port, $socket); + printf("[001] Cannot connect to the server using host=%s, user=pamtest, passwd=pamtest dbname=%s, port=%s, socket=%s\n", + $host, $db, $port, $socket); } else { if (!$res = $link->query("SELECT id FROM test WHERE id = 1")) |