Skip to content

Commit 66c48e8

Browse files
cmb69cmb69
committed
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Fix SKIPIF in ext/mysqli
2 parents 878704f + 37d27e6 commit 66c48e8

11 files changed

+20
-20
lines changed

‎ext/mysqli/tests/015.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ mysqli autocommit/commit/rollback with innodb
77

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

1212
if (!have_innodb($link))
13-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
13+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1414
?>
1515
--FILE--
1616
<?php

‎ext/mysqli/tests/mysqli_autocommit.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ mysqli_autocommit()
1313
}
1414

1515
if (!have_innodb($link))
16-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
16+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1717
?>
1818
--FILE--
1919
<?php

‎ext/mysqli/tests/mysqli_autocommit_oo.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mysqli->autocommit()
1414
}
1515

1616
if (!have_innodb($link))
17-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
17+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1818
?>
1919
--FILE--
2020
<?php

‎ext/mysqli/tests/mysqli_begin_transaction.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');
88

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

1313
if (!have_innodb($link))
14-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
14+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1515
?>
1616
--FILE--
1717
<?php

‎ext/mysqli/tests/mysqli_change_user_rollback.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ require_once('skipifemb.inc');
77
require_once('skipifconnectfailure.inc');
88
require_once('connect.inc');
99
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
10-
die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
10+
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
1111

1212
if (!have_innodb($link))
13-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
13+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1414
?>
1515
--FILE--
1616
<?php

‎ext/mysqli/tests/mysqli_commit.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');
88

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

1313
if (!have_innodb($link))
14-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
14+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1515
?>
1616
--FILE--
1717
<?php

‎ext/mysqli/tests/mysqli_commit_oo.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');
88

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

1313
if (!have_innodb($link))
14-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
14+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1515
?>
1616
--FILE--
1717
<?php

‎ext/mysqli/tests/mysqli_fork.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ if (!function_exists('posix_getpid'))
1414

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

1919
if (!have_innodb($link))
20-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
20+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
2121
?>
2222
--FILE--
2323
<?php

‎ext/mysqli/tests/mysqli_release_savepoint.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');
88

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

1313
if (!have_innodb($link))
14-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
14+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1515
?>
1616
--FILE--
1717
<?php

‎ext/mysqli/tests/mysqli_rollback.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ mysqli_rollback()
1010

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

1515
if (!have_innodb($link))
16-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
16+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1717
?>
1818
--FILE--
1919
<?php

‎ext/mysqli/tests/mysqli_savepoint.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');
88

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

1313
if (!have_innodb($link))
14-
die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
14+
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
1515
?>
1616
--FILE--
1717
<?php

0 commit comments

Comments
 (0)