diff options
| author | Remi Collet <remi@php.net> | 2013-06-19 12:26:53 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-06-19 12:26:53 +0200 |
| commit | fb68e0fe63866541f0f816fbcc4343ff62b81234 (patch) | |
| tree | 121ab0765a815799bb64743260acb80efe4fbce7 | |
| parent | 9b8259cdfa0f6b54984bb3268b17e7a36fa448d8 (diff) | |
| parent | 67bde2f8ac4a6c5a8d36f7aebfd2a4a1621142d0 (diff) | |
| download | php-git-fb68e0fe63866541f0f816fbcc4343ff62b81234.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Related to bug #65047 (Test skip on client / server version)
| -rw-r--r-- | ext/pdo_pgsql/tests/bug46274.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_pgsql/tests/bug46274_2.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_pgsql/tests/bug_49985.phpt | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/pdo_pgsql/tests/bug46274.phpt b/ext/pdo_pgsql/tests/bug46274.phpt index 8a85c9fe0c..40706ecaa3 100644 --- a/ext/pdo_pgsql/tests/bug46274.phpt +++ b/ext/pdo_pgsql/tests/bug46274.phpt @@ -15,7 +15,7 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true); try { - $db->query("SET bytea_output = 'escape'"); + @$db->query("SET bytea_output = 'escape'"); } catch (Exception $e) { } diff --git a/ext/pdo_pgsql/tests/bug46274_2.phpt b/ext/pdo_pgsql/tests/bug46274_2.phpt index 317160c37a..df60f34540 100644 --- a/ext/pdo_pgsql/tests/bug46274_2.phpt +++ b/ext/pdo_pgsql/tests/bug46274_2.phpt @@ -15,7 +15,7 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); try { - $db->query("SET bytea_output = 'escape'"); + @$db->query("SET bytea_output = 'escape'"); } catch (Exception $e) { } diff --git a/ext/pdo_pgsql/tests/bug_49985.phpt b/ext/pdo_pgsql/tests/bug_49985.phpt index 26dcfc617d..e1d7df82a0 100644 --- a/ext/pdo_pgsql/tests/bug_49985.phpt +++ b/ext/pdo_pgsql/tests/bug_49985.phpt @@ -30,6 +30,6 @@ for ($i = 0; $i < 3; $i++) { ?> --EXPECTF-- bool(true) -SQLSTATE[23505]: %s"test_pkey" -SQLSTATE[23505]: %s"test_pkey" +SQLSTATE[23505]: %stest_pkey%s +SQLSTATE[23505]: %stest_pkey%s |