Author: uwendel
Date: 2007-06-28 12:44:59 +0200 (Thu, 28 Jun 2007)
New Revision: 557
Modified:
trunk/tests/ext/mysqli/mysqli_change_user_oo.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt
Log:
As usual we ignore the problems. For mysqlnd I let the test fails, Andrey wants to have a
look.
Modified: trunk/tests/ext/mysqli/mysqli_change_user_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_change_user_oo.phpt 2007-06-28 09:57:51 UTC (rev 556)
+++ trunk/tests/ext/mysqli/mysqli_change_user_oo.phpt 2007-06-28 10:44:59 UTC (rev 557)
@@ -5,7 +5,7 @@
require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('table.inc');
-if (!$IS_MYSQLND && mysqli_get_server_version($link) < 50118) {
+if (!$IS_MYSQLND && (mysqli_get_server_version($link) < 50118 &&
mysqli_get_server_version($link) > 50100)) {
die("skip Known bug that will cause a crash");
}
?>
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt 2007-06-28 09:57:51 UTC
(rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt 2007-06-28 10:44:59 UTC
(rev 557)
@@ -4,8 +4,13 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('connect.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
+
+if (!$IS_MYSQLND)
+ /* for mysqlnd we want to see the error for libmysql ... */
+ die("skip - experimental since years and segfaulting");
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt 2007-06-28 09:57:51 UTC
(rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt 2007-06-28 10:44:59 UTC
(rev 557)
@@ -4,8 +4,13 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('connect.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
+if (!$IS_MYSQLND)
+ /* for mysqlnd we want to see the error for libmysql ... */
+ die("skip - experimental since years and buggy");
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt 2007-06-28
09:57:51 UTC (rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt 2007-06-28
10:44:59 UTC (rev 557)
@@ -4,13 +4,19 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('connect.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
+
+if (!$IS_MYSQLND)
+ /* for mysqlnd we want to see the error for libmysql ... */
+ die("skip - experimental since years and segfaulting");
?>
--FILE--
<?php
- include "connect.inc";
- include("table.inc");
+ include_once "connect.inc";
+ include_once("table.inc");
function shutdown_clean($file) {
if ($file) {
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt 2007-06-28
09:57:51 UTC (rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt 2007-06-28
10:44:59 UTC (rev 557)
@@ -4,13 +4,19 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+include_once('connect.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
+
+if (!$IS_MYSQLND)
+ /* for mysqlnd we want to see the error for libmysql ... */
+ die("skip - experimental since years and buggy");
?>
--FILE--
<?php
- include "connect.inc";
- include("table.inc");
+ include_once "connect.inc";
+ include_once ("table.inc");
function shutdown_clean($file) {
if ($file) {
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt 2007-06-28
09:57:51 UTC (rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt 2007-06-28
10:44:59 UTC (rev 557)
@@ -4,8 +4,14 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('connect.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
+
+if (!$IS_MYSLQND)
+ /* for mysqlnd we want to see the error for libmysql ... */
+ die("skip - experimental since years and segfaulting");
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt 2007-06-28
09:57:51 UTC (rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt 2007-06-28
10:44:59 UTC (rev 557)
@@ -4,8 +4,13 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('connect.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
+
+if (!$IS_MYSQLND)
+ die("skip - experimental since years and segfaulting");
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt 2007-06-28
09:57:51 UTC (rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt 2007-06-28
10:44:59 UTC (rev 557)
@@ -1,16 +1,16 @@
--TEST--
-mysqli_set_local_infile_handler() - negative return value/buflen
+mysqli_set_local_infile_handler() - negative return value/buflen to indicate an error
--SKIPIF--
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
- die("skip - function not available.");
+ die("skip - function not available.");
?>
--FILE--
<?php
- include "connect.inc";
- include("table.inc");
+ include_once("connect.inc");
+ include_once("table.inc");
function shutdown_clean($file) {
if ($file) {
@@ -23,7 +23,8 @@
printf("Callback: %d\n", $invocation);
$buffer = fread($fp, $buflen);
-
+
+ $error = "negative length means error";
return -1;
}
@@ -112,6 +113,7 @@
print "done!";
?>
--EXPECTF--
-Callback set to 'callback_buffer_overflow'
+Callback set to 'callback_negative_len'
Callback: 0
-done!
+[022] LOAD DATA failed, [2000] negative length means error
+done!
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt 2007-06-28
09:57:51 UTC (rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt 2007-06-28
10:44:59 UTC (rev 557)
@@ -21,7 +21,7 @@
function callback_simple($fp, &$buffer, $buflen, &$error) {
static $invocation = 0;
- printf("Callback: %d\n", $invocation);
+ printf("Callback - callback_simple(): %d\n", $invocation);
$invocation++;
if (!is_resource($fp))
@@ -61,14 +61,14 @@
}
/* report the wrong length */
- return strlen($buffer) - 1;
+ return strlen($buffer);
}
function callback_report_short_len($fp, &$buffer, $buflen, &$error) {
static $invocation = 0;
- printf("Callback: %d\n", $invocation);
- return callback_simple($fp, $buffer, $buflen, $error) -1;
+ printf("Callback - report_short_len(): %d\n", $invocation++);
+ return callback_simple($fp, $buffer, $buflen, $error);
}
function try_handler($offset, $link, $file, $handler, $expected) {
@@ -163,8 +163,8 @@
?>
--EXPECTF--
Callback set to 'callback_report_short_len'
-Callback: 0
-Callback: 0
-Callback: 1
-Callback: 1
-done!
+Callback - report_short_len(): 0
+Callback - callback_simple(): 0
+Callback - report_short_len(): 1
+Callback - callback_simple(): 1
+done!
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt 2007-06-28
09:57:51 UTC (rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt 2007-06-28
10:44:59 UTC (rev 557)
@@ -4,8 +4,14 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('connect.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
+
+if (!$IS_MYSQLND)
+ /* for mysqlnd we want to see the error for libmysql ... */
+ die("skip - experimental since years and segfaulting");
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt 2007-06-28
09:57:51 UTC (rev 556)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt 2007-06-28
10:44:59 UTC (rev 557)
@@ -4,8 +4,14 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('connect.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
+
+if (!$IS_MYSQLND)
+ /* for mysqlnd we want to see the error for libmysql ... */
+ die("skip - experimental since years and segfaulting");
?>
--FILE--
<?php
| Thread |
|---|
| • PHP mysqlnd svn commit: r557 - trunk/tests/ext/mysqli | uwendel | 28 Jun |
