summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-02-13 17:48:17 +0100
committerNikita Popov <nikic@php.net>2016-02-13 17:48:17 +0100
commitf43fe8cb4c7d70eab536ddae50a38824a5b32af9 (patch)
tree6cba06cd9eaa849433bddfafea809e3655c72a57 /ext/pdo_mysql
parent7f474086e34db430dc774795d4ca0c0999b97d93 (diff)
parent4e0134c6618844f076d40fb346e78b89e98c825c (diff)
downloadphp-git-f43fe8cb4c7d70eab536ddae50a38824a5b32af9.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/pdo_mysql')
-rw-r--r--ext/pdo_mysql/tests/bug71569.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_mysql/tests/bug71569.phpt b/ext/pdo_mysql/tests/bug71569.phpt
index 3ace1e98bf..32c14b4622 100644
--- a/ext/pdo_mysql/tests/bug71569.phpt
+++ b/ext/pdo_mysql/tests/bug71569.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #70389 (PDO constructor changes unrelated variables)
+Bug #71569 (#70389 fix causes segmentation fault)
--SKIPIF--
<?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');