Author: uwendel
Date: 2007-08-08 17:37:02 +0200 (Wed, 08 Aug 2007)
New Revision: 863
Modified:
trunk/tests/ext/mysqli/067.phpt
trunk/tests/ext/mysqli/bug37090.phpt
trunk/tests/ext/mysqli/mysqli_character_set.phpt
trunk/tests/ext/mysqli/mysqli_class_mysqli_driver_interface.phpt
trunk/tests/ext/mysqli/mysqli_fork.phpt
trunk/tests/ext/mysqli/mysqli_master_query.phpt
trunk/tests/ext/mysqli/mysqli_pconnect.phpt
trunk/tests/ext/mysqli/mysqli_rpl_parse_enabled.phpt
trunk/tests/ext/mysqli/mysqli_rpl_probe.phpt
trunk/tests/ext/mysqli/mysqli_rpl_query_type.phpt
trunk/tests/ext/mysqli/mysqli_send_query.phpt
trunk/tests/ext/mysqli/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt
trunk/tests/ext/mysqli/mysqli_slave_query.phpt
trunk/tests/ext/mysqli/mysqli_stmt_bind_result_bit.phpt
Log:
Fixing several typos introduced with the recent MYSQL_TEST_SKIP_CONNECT_FAILURE change
Modified: trunk/tests/ext/mysqli/067.phpt
===================================================================
--- trunk/tests/ext/mysqli/067.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/067.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -3,22 +3,22 @@
--SKIPIF--
<?php
require_once('skipif.inc');
+ require_once('skipifconnectfailure.inc');
include "connect.inc";
if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip Cannot connect to check required version");
/* skip cursor test for versions < 50004 */
- if ((!$IS_MYSQLND && mysqli_get_client_version() < 50009) ||
+ if ((!$IS_MYSQLND && (mysqli_get_client_version() < 50009)) ||
(mysqli_get_server_version($link) < 50009)) {
die(sprintf("skip Client library doesn't support cursors (%s/%s)",
- mysqli_get_client_version(), mysqli_get_server_version($link));
+ mysqli_get_client_version(), mysqli_get_server_version($link)));
}
mysqli_close($link);
?>
--FILE--
<?php
-
function open_cursor($mysql, $query) {
if (!is_object($stmt = $mysql->prepare($query))) {
printf("[001] Cannot create statement object for '%s', [%d] %s\n",
Modified: trunk/tests/ext/mysqli/bug37090.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug37090.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/bug37090.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -3,6 +3,7 @@
--SKIPIF--
<?php
require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_charset')) {
die('skip mysqli_set_charset() not available');
}
Modified: trunk/tests/ext/mysqli/mysqli_character_set.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_character_set.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_character_set.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -2,10 +2,10 @@
Fetching results from tables of different charsets.
--SKIPIF--
<?php
+require_once('skipifconnectfailure.inc');
require_once('skipifunicode.inc');
require_once('skipif.inc');
require_once('skipifemb.inc');
-require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_class_mysqli_driver_interface.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_class_mysqli_driver_interface.phpt 2007-08-08 13:16:48
UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_class_mysqli_driver_interface.phpt 2007-08-08 15:37:02
UTC (rev 863)
@@ -1,8 +1,11 @@
--TEST--
Interface of the class mysqli_driver
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
require('connect.inc');
Modified: trunk/tests/ext/mysqli/mysqli_fork.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fork.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_fork.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -2,7 +2,6 @@
Forking a child and using the same connection.
--SKIPIF--
<?php
-<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
Modified: trunk/tests/ext/mysqli/mysqli_master_query.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_master_query.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_master_query.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_master_query')) {
die("skip mysqli_master_query() not available");
}
Modified: trunk/tests/ext/mysqli/mysqli_pconnect.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_pconnect.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_pconnect.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -4,7 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
-quire_once('skipifconnectfailure.inc');
+require_once('skipifconnectfailure.inc');
if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
die("skip: only available in mysqlnd");
Modified: trunk/tests/ext/mysqli/mysqli_rpl_parse_enabled.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_rpl_parse_enabled.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_rpl_parse_enabled.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_rpl_parse_enabled')) {
die("skip mysqli_rpl_parse_enabled() not available");
}
Modified: trunk/tests/ext/mysqli/mysqli_rpl_probe.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_rpl_probe.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_rpl_probe.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_rpl_probe')) {
die("skip mysqli_rpl_probe() not available");
}
Modified: trunk/tests/ext/mysqli/mysqli_rpl_query_type.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_rpl_query_type.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_rpl_query_type.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_rpl_query_type')) {
die("skip mysqli_rpl_query_type() not available");
}
Modified: trunk/tests/ext/mysqli/mysqli_send_query.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_send_query.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_send_query.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_send_query')) {
die("skip mysqli_send_query() not available");
}
Modified: trunk/tests/ext/mysqli/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt 2007-08-08
13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt 2007-08-08
15:37:02 UTC (rev 863)
@@ -1,7 +1,6 @@
--TEST--
mysqli_set_opt() - MYSQLI_OPT_NUMERIC_AND_DATETIME_AS_UNICODE
--SKIPIF--
-<?php
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
Modified: trunk/tests/ext/mysqli/mysqli_slave_query.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_slave_query.phpt 2007-08-08 13:16:48 UTC (rev 862)
+++ trunk/tests/ext/mysqli/mysqli_slave_query.phpt 2007-08-08 15:37:02 UTC (rev 863)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_slave_query')) {
die("skip mysqli_slave_query() not available");
}
Modified: trunk/tests/ext/mysqli/mysqli_stmt_bind_result_bit.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_bind_result_bit.phpt 2007-08-08 13:16:48 UTC (rev
862)
+++ trunk/tests/ext/mysqli/mysqli_stmt_bind_result_bit.phpt 2007-08-08 15:37:02 UTC (rev
863)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_bind_result()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
@@ -98,7 +101,7 @@
break;
}
- $sql = sprintf("SELECT id, BIN(bit_value) AS _bin, bit_value, bit_value + 0 AS
_bit_value0, bit_null FROM test WHERE id = %s", $value);
+ $sql = sprintf("SELECT id, BIN(bit_value) AS _bin, bit_value, bit_value + 0 AS
_bit_value0, bit_null FROM test WHERE id = %d", $value);
if ((!mysqli_stmt_prepare($stmt_sel, $sql)) ||
(!mysqli_stmt_execute($stmt_sel))) {
printf("[009 - %d] [%d] %s\n", $bits, mysqli_stmt_errno($stmt_sel),
mysqli_stmt_error($stmt_sel));
@@ -147,4 +150,4 @@
--EXPECTF--
done!
--UEXPECTF--
-done!
+done!
\ No newline at end of file
| Thread |
|---|
| • PHP mysqlnd svn commit: r863 - trunk/tests/ext/mysqli | uwendel | 8 Aug |
