Skip to content

Commit

Permalink
Fix SKIPIF in ext/mysqli
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmb69
Fabien Villepinte authored and cmb69 committed Sep 27, 2019
1 parent 115f6ef commit 37d27e6
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions ext/mysqli/tests/015.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ mysqli autocommit/commit/rollback with innodb

require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqli/tests/mysqli_autocommit.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ mysqli_autocommit()
}

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqli/tests/mysqli_autocommit_oo.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mysqli->autocommit()
}

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_begin_transaction.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_change_user_rollback.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_commit.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_commit_oo.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_fork.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ if (!function_exists('posix_getpid'))

require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_release_savepoint.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_rollback.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ mysqli_rollback()

require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_savepoint.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

if (!have_innodb($link))
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
?>
--FILE--
<?php
Expand Down

0 comments on commit 37d27e6

Please sign in to comment.