summaryrefslogtreecommitdiff
path: root/ext/mysql
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-10-10 10:45:07 +0800
committerXinchen Hui <laruence@php.net>2012-10-10 10:45:07 +0800
commit69a4301f6c235fb4535bdd31a9de5f730f07574d (patch)
tree0a32bd23bca6ed431f01a80deba154dc952c6b85 /ext/mysql
parent45e938ec343ba566a3effd7a2247a00a08f683cd (diff)
parent1b9e0de2ccab0d6ae6f77b53b5c3a306ec154496 (diff)
downloadphp-git-69a4301f6c235fb4535bdd31a9de5f730f07574d.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'ext/mysql')
-rw-r--r--[-rwxr-xr-x]ext/mysql/tests/connect.inc0
-rw-r--r--[-rwxr-xr-x]ext/mysql/tests/skipif.inc0
-rw-r--r--[-rwxr-xr-x]ext/mysql/tests/skipifconnectfailure.inc0
3 files changed, 0 insertions, 0 deletions
diff --git a/ext/mysql/tests/connect.inc b/ext/mysql/tests/connect.inc
index 0df5bc3aa0..0df5bc3aa0 100755..100644
--- a/ext/mysql/tests/connect.inc
+++ b/ext/mysql/tests/connect.inc
diff --git a/ext/mysql/tests/skipif.inc b/ext/mysql/tests/skipif.inc
index 0f932892ca..0f932892ca 100755..100644
--- a/ext/mysql/tests/skipif.inc
+++ b/ext/mysql/tests/skipif.inc
diff --git a/ext/mysql/tests/skipifconnectfailure.inc b/ext/mysql/tests/skipifconnectfailure.inc
index a57c7dbd58..a57c7dbd58 100755..100644
--- a/ext/mysql/tests/skipifconnectfailure.inc
+++ b/ext/mysql/tests/skipifconnectfailure.inc