summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql/tests
diff options
context:
space:
mode:
authorTimm Friebe <thekid@thekid.de>2014-09-25 19:45:05 +0200
committerTimm Friebe <thekid@thekid.de>2014-09-25 19:45:05 +0200
commite83580c1f00a60d4ad926e849052028211480af9 (patch)
tree1fef3277df2d71756e49fbf81ccb026a62c41911 /ext/pdo_mysql/tests
parent3db67313c9207ca12a512a08d1bdd54347f821c8 (diff)
parenteabad90acbdac82a5b3f78d71477727354f9e64d (diff)
downloadphp-git-e83580c1f00a60d4ad926e849052028211480af9.tar.gz
Merge branch 'master' into catchable-fatals/methods-on-non-objects
Diffstat (limited to 'ext/pdo_mysql/tests')
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt
index 22d36183cb..fb7e9a9d0a 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt
@@ -30,4 +30,4 @@ MySQLPDOTest::skip();
}
?>
--EXPECTF--
-done! \ No newline at end of file
+done!