summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-08-11 01:37:44 -0700
committerStanislav Malyshev <stas@php.net>2013-08-11 01:37:44 -0700
commit6e92f07926c4bd39f263e913b55ed27a2d27d875 (patch)
tree582a890fa57e69a628d119be991e068e8fba3118
parent6c494edfb7acf5e8f16b97f74de68c4cbbc1a97a (diff)
parent76fd13f742853b1d90c2bb79d7076636c9b141a0 (diff)
downloadphp-git-6e92f07926c4bd39f263e913b55ed27a2d27d875.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: use mysqlnd, some tests fail otherwise
-rwxr-xr-xtravis/compile.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/travis/compile.sh b/travis/compile.sh
index b48bfe8e24..a56db63c12 100755
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@ -1,9 +1,9 @@
#!/bin/bash
./buildconf
./configure --quiet \
---with-pdo-mysql \
---with-mysql \
---with-mysqli \
+--with-pdo-mysql=mysqlnd \
+--with-mysql=mysqlnd \
+--with-mysqli=mysqlnd \
--with-pgsql \
--with-pdo-pgsql \
--with-pdo-sqlite \