summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/mysqli/tests/mysqli_autocommit_oo.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt11
2 files changed, 8 insertions, 5 deletions
diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
index c3be58bc3c..3a5a25779d 100644
--- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt
+++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
@@ -7,7 +7,7 @@ mysqli->autocommit()
require_once('skipifconnectfailure.inc');
require_once('connect.inc');
- if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) {
+ if (!$link = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) {
printf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
$host, $user, $db, $port, $socket);
exit(1);
diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
index c9e5f19962..7163aca10d 100644
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
@@ -2,14 +2,17 @@
mysqli_set_local_infile_handler() - open basedir restrictions
--SKIPIF--
<?php
-require_once('skipif.inc');
-require_once('skipifemb.inc');
-require_once('skipifconnectfailure.inc');
+if (!$fp = @fopen('skipif.inc', 'r'))
+ die("skip open_basedir restrictions forbid opening include files");
+
+include_once('skipif.inc');
+include_once('skipifemb.inc');
+include_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
-require_once('connect.inc');
+include_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip Cannot connect to MySQL");