summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-06-17 13:23:24 +0800
committerXinchen Hui <laruence@php.net>2013-06-17 13:23:24 +0800
commitaa2369f85a7d188b2b1c43f5bb3478ac59039a66 (patch)
tree98f143b7584a2052d81d3e8a984e32a21663c004 /ext/pdo_mysql
parent9bfb28c7932a9b82b34bce60cd360ea6d3c6705b (diff)
parentcfb1ffb4fa9d8a8561ffa509e187808b09608074 (diff)
downloadphp-git-aa2369f85a7d188b2b1c43f5bb3478ac59039a66.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/pdo_mysql')
-rw-r--r--ext/pdo_mysql/tests/bug63176.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_mysql/tests/bug63176.phpt b/ext/pdo_mysql/tests/bug63176.phpt
index 392a90b463..ee928c093d 100644
--- a/ext/pdo_mysql/tests/bug63176.phpt
+++ b/ext/pdo_mysql/tests/bug63176.phpt
@@ -24,7 +24,7 @@ class ModelA {
if ($h) {
$this->db = new PDO2(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, array(PDO::ATTR_PERSISTENT => true));
} else {
- $this->db = new PDO2(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, array(PDO::ATTR_PERSISTENT => true));
+ $this->db = new PDO3(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, array(PDO::ATTR_PERSISTENT => true));
}
$this->db->query('SELECT 1')->fetchAll();
}