felipe Mon Jan 5 18:22:02 2009 UTC
Modified files:
/php-src/ext/mysql/tests 001.phpt 002.phpt 003.phpt
mysql_escape_string.phpt
mysql_fetch_array.phpt
mysql_fetch_assoc.phpt
mysql_fetch_field.phpt
mysql_fetch_object.phpt
mysql_fetch_row.phpt mysql_field_name.phpt
mysql_field_seek.phpt
mysql_field_table.phpt
mysql_field_type.phpt
mysql_pconn_max_links.phpt
mysql_query.phpt
mysql_real_escape_string.phpt
mysql_result.phpt mysql_select_db.phpt
mysql_set_charset.phpt
mysql_tablename.phpt
mysql_unbuffered_query.phpt
Log:
- Fixed tests (removed UEXPECT(F) section)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/001.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/001.phpt
diff -u php-src/ext/mysql/tests/001.phpt:1.5
php-src/ext/mysql/tests/001.phpt:1.6
--- php-src/ext/mysql/tests/001.phpt:1.5 Wed Jul 11 11:12:10 2007
+++ php-src/ext/mysql/tests/001.phpt Mon Jan 5 18:22:01 2009
@@ -25,9 +25,6 @@
var_dump($test);
print "done!";
?>
---EXPECT--
-string(2) "11"
-done!
---UEXPECTF--
+--EXPECTF--
unicode(2) "11"
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/002.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/002.phpt
diff -u php-src/ext/mysql/tests/002.phpt:1.3
php-src/ext/mysql/tests/002.phpt:1.4
--- php-src/ext/mysql/tests/002.phpt:1.3 Fri Oct 12 12:32:39 2007
+++ php-src/ext/mysql/tests/002.phpt Mon Jan 5 18:22:01 2009
@@ -39,29 +39,6 @@
bool(true)
resource(%d) of type (mysql result)
array(3) {
- ["col1"]=>
- string(1) "1"
- ["col2"]=>
- string(3) "foo"
- ["col3"]=>
- string(3) "bar"
-}
-array(3) {
- ["col1"]=>
- string(1) "2"
- ["col2"]=>
- string(3) "foo"
- ["col3"]=>
- string(3) "bar"
-}
-done!
---UEXPECTF--
-resource(%d) of type (mysql link)
-bool(true)
-bool(true)
-bool(true)
-resource(%d) of type (mysql result)
-array(3) {
[u"col1"]=>
unicode(1) "1"
[u"col2"]=>
@@ -77,4 +54,4 @@
[u"col3"]=>
unicode(3) "bar"
}
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/003.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/003.phpt
diff -u php-src/ext/mysql/tests/003.phpt:1.3
php-src/ext/mysql/tests/003.phpt:1.4
--- php-src/ext/mysql/tests/003.phpt:1.3 Fri Oct 12 12:32:39 2007
+++ php-src/ext/mysql/tests/003.phpt Mon Jan 5 18:22:01 2009
@@ -55,37 +55,6 @@
--EXPECTF--
==stdClass==
object(stdClass)#%d (1) {
- ["a"]=>
- string(3) "one"
-}
-object(stdClass)#%d (1) {
- ["a"]=>
- string(3) "two"
-}
-object(stdClass)#%d (1) {
- ["a"]=>
- string(5) "three"
-}
-==class24==
-class24::__construct
-object(class24)#%d (1) {
- ["a"]=>
- string(3) "one"
-}
-class24::__construct
-object(class24)#%d (1) {
- ["a"]=>
- string(3) "two"
-}
-class24::__construct
-object(class24)#%d (1) {
- ["a"]=>
- string(5) "three"
-}
-done!
---UEXPECTF--
-==stdClass==
-object(stdClass)#%d (1) {
[u"a"]=>
unicode(3) "one"
}
@@ -113,4 +82,4 @@
[u"a"]=>
unicode(5) "three"
}
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_escape_string.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_escape_string.phpt
diff -u php-src/ext/mysql/tests/mysql_escape_string.phpt:1.2
php-src/ext/mysql/tests/mysql_escape_string.phpt:1.3
--- php-src/ext/mysql/tests/mysql_escape_string.phpt:1.2 Wed Jul 11
13:22:17 2007
+++ php-src/ext/mysql/tests/mysql_escape_string.phpt Mon Jan 5 18:22:01 2009
@@ -23,15 +23,6 @@
print "done!";
?>
--EXPECTF--
-string(31) "Am I a unicode string in PHP 6?"
-string(2) "\\"
-string(2) "\""
-string(2) "\'"
-string(2) "\n"
-string(2) "\r"
-string(8) "foo\0bar"
-done!
---UEXPECTF--
unicode(31) "Am I a unicode string in PHP 6?"
unicode(2) "\\"
unicode(2) "\""
@@ -39,4 +30,4 @@
unicode(2) "\n"
unicode(2) "\r"
unicode(8) "foo\0bar"
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_array.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_array.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.5
php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.6
--- php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.5 Mon Dec 1 21:20:27 2008
+++ php-src/ext/mysql/tests/mysql_fetch_array.phpt Mon Jan 5 18:22:01 2009
@@ -281,82 +281,6 @@
[005]
array(4) {
[0]=>
- string(1) "1"
- ["id"]=>
- string(1) "1"
- [1]=>
- string(1) "a"
- ["label"]=>
- string(1) "a"
-}
-[006]
-array(2) {
- [0]=>
- string(1) "2"
- [1]=>
- string(1) "b"
-}
-[007]
-array(4) {
- [0]=>
- string(1) "3"
- ["id"]=>
- string(1) "3"
- [1]=>
- string(1) "c"
- ["label"]=>
- string(1) "c"
-}
-[008]
-array(2) {
- ["id"]=>
- string(1) "4"
- ["label"]=>
- string(1) "d"
-}
-[009]
-array(4) {
- [0]=>
- string(1) "5"
- ["id"]=>
- string(1) "5"
- [1]=>
- string(1) "e"
- ["label"]=>
- string(1) "e"
-}
-[011]
-array(11) {
- [0]=>
- string(1) "1"
- ["a"]=>
- string(1) "2"
- [1]=>
- string(1) "2"
- [2]=>
- string(1) "3"
- ["c"]=>
- string(1) "3"
- [3]=>
- string(1) "4"
- ["C"]=>
- string(1) "4"
- [4]=>
- NULL
- ["d"]=>
- NULL
- [5]=>
- string(1) "1"
- ["e"]=>
- string(1) "1"
-}
-
-Warning: mysql_fetch_array(): %d is not a valid MySQL result resource in %s on
line %d
-done!
---UEXPECTF--
-[005]
-array(4) {
- [0]=>
unicode(1) "1"
[u"id"]=>
unicode(1) "1"
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_assoc.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_assoc.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.5
php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.6
--- php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.5 Mon Dec 1 21:20:27 2008
+++ php-src/ext/mysql/tests/mysql_fetch_assoc.phpt Mon Jan 5 18:22:01 2009
@@ -61,45 +61,6 @@
--EXPECTF--
[005]
array(2) {
- ["id"]=>
- string(1) "1"
- ["label"]=>
- string(1) "a"
-}
-[006]
-bool(false)
-[008]
-array(5) {
- ["a"]=>
- string(1) "2"
- ["c"]=>
- string(1) "3"
- ["C"]=>
- string(1) "4"
- ["d"]=>
- NULL
- ["e"]=>
- string(1) "1"
-}
-
-Warning: mysql_fetch_assoc(): %d is not a valid MySQL result resource in %s on
line %d
-[010]
-array(5) {
- ["id"]=>
- string(1) "1"
- ["label"]=>
- string(1) "a"
- ["_id"]=>
- string(1) "1"
- ["_label"]=>
- string(2) "aa"
- ["_foo"]=>
- NULL
-}
-done!
---UEXPECTF--
-[005]
-array(2) {
[u"id"]=>
unicode(1) "1"
[u"label"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_field.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_field.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.6
php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.7
--- php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.6 Fri Nov 28 20:21:35 2008
+++ php-src/ext/mysql/tests/mysql_fetch_field.phpt Mon Jan 5 18:22:01 2009
@@ -135,125 +135,6 @@
?>
--EXPECTF--
object(stdClass)#%d (13) {
- ["name"]=>
- string(2) "ID"
- ["table"]=>
- string(4) "TEST"
- ["def"]=>
- string(0) ""
- ["max_length"]=>
- int(1)
- ["not_null"]=>
- int(1)
- ["primary_key"]=>
- int(1)
- ["multiple_key"]=>
- int(0)
- ["unique_key"]=>
- int(0)
- ["numeric"]=>
- int(1)
- ["blob"]=>
- int(0)
- ["type"]=>
- string(3) "int"
- ["unsigned"]=>
- int(0)
- ["zerofill"]=>
- int(0)
-}
-object(stdClass)#%d (13) {
- ["name"]=>
- string(5) "label"
- ["table"]=>
- string(4) "TEST"
- ["def"]=>
- string(0) ""
- ["max_length"]=>
- int(1)
- ["not_null"]=>
- int(0)
- ["primary_key"]=>
- int(0)
- ["multiple_key"]=>
- int(0)
- ["unique_key"]=>
- int(0)
- ["numeric"]=>
- int(0)
- ["blob"]=>
- int(0)
- ["type"]=>
- string(6) "string"
- ["unsigned"]=>
- int(0)
- ["zerofill"]=>
- int(0)
-}
-bool(false)
-
-Warning: mysql_fetch_field(): Bad field offset in %s on line %d
-
-Warning: mysql_fetch_field(): %d is not a valid MySQL result resource in %s on
line %d
-object(stdClass)#%d (13) {
- ["name"]=>
- string(2) "id"
- ["table"]=>
- string(4) "test"
- ["def"]=>
- string(0) ""
- ["max_length"]=>
- int(1)
- ["not_null"]=>
- int(0)
- ["primary_key"]=>
- int(0)
- ["multiple_key"]=>
- int(0)
- ["unique_key"]=>
- int(0)
- ["numeric"]=>
- int(1)
- ["blob"]=>
- int(0)
- ["type"]=>
- string(3) "int"
- ["unsigned"]=>
- int(0)
- ["zerofill"]=>
- int(0)
-}
-object(stdClass)#%d (13) {
- ["name"]=>
- string(2) "id"
- ["table"]=>
- string(4) "test"
- ["def"]=>
- string(1) "1"
- ["max_length"]=>
- int(0)
- ["not_null"]=>
- int(0)
- ["primary_key"]=>
- int(0)
- ["multiple_key"]=>
- int(0)
- ["unique_key"]=>
- int(0)
- ["numeric"]=>
- int(1)
- ["blob"]=>
- int(0)
- ["type"]=>
- string(3) "int"
- ["unsigned"]=>
- int(0)
- ["zerofill"]=>
- int(0)
-}
-done!
---UEXPECTF--
-object(stdClass)#%d (13) {
[u"name"]=>
unicode(2) "ID"
[u"table"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_object.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_object.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.4
php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.5
--- php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.4 Wed Oct 10 10:56:33 2007
+++ php-src/ext/mysql/tests/mysql_fetch_object.phpt Mon Jan 5 18:22:01 2009
@@ -79,75 +79,6 @@
?>
--EXPECTF--
object(stdClass)#%d (2) {
- ["ID"]=>
- string(1) "1"
- ["label"]=>
- string(1) "a"
-}
-object(mysql_fetch_object_test)#%d (4) {
- ["a"]=>
- NULL
- ["b"]=>
- NULL
- ["ID"]=>
- string(1) "2"
- ["label"]=>
- string(1) "b"
-}
-
-Warning: Missing argument 1 for mysql_fetch_object_construct::__construct() in
%s on line %d
-
-Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in
%s on line %d
-
-Notice: Undefined variable: a in %s on line %d
-
-Notice: Undefined variable: b in %s on line %d
-object(mysql_fetch_object_construct)#%d (4) {
- ["a"]=>
- NULL
- ["b"]=>
- NULL
- ["ID"]=>
- string(1) "3"
- ["label"]=>
- string(1) "c"
-}
-
-Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in
%s on line %d
-
-Notice: Undefined variable: b in %s on line %d
-object(mysql_fetch_object_construct)#%d (4) {
- ["a"]=>
- string(1) "a"
- ["b"]=>
- NULL
- ["ID"]=>
- string(1) "4"
- ["label"]=>
- string(1) "d"
-}
-object(mysql_fetch_object_construct)#%d (4) {
- ["a"]=>
- string(1) "a"
- ["b"]=>
- string(1) "b"
- ["ID"]=>
- string(1) "5"
- ["label"]=>
- string(1) "e"
-}
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-
-Warning: mysql_fetch_object(): %d is not a valid MySQL result resource in %s
on line %d
-bool(false)
-
-Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d
---UEXPECTF--
-object(stdClass)#%d (2) {
[u"ID"]=>
unicode(1) "1"
[u"label"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_row.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_row.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.5
php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.6
--- php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.5 Mon Dec 1 21:20:27 2008
+++ php-src/ext/mysql/tests/mysql_fetch_row.phpt Mon Jan 5 18:22:01 2009
@@ -40,20 +40,6 @@
[004]
array(2) {
[0]=>
- string(1) "1"
- [1]=>
- string(1) "a"
-}
-[005]
-bool(false)
-
-Warning: mysql_fetch_row(): %d is not a valid MySQL result resource in %s on
line %d
-bool(false)
-done!
---UEXPECTF--
-[004]
-array(2) {
- [0]=>
unicode(1) "1"
[1]=>
unicode(1) "a"
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_name.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_name.phpt
diff -u php-src/ext/mysql/tests/mysql_field_name.phpt:1.4
php-src/ext/mysql/tests/mysql_field_name.phpt:1.5
--- php-src/ext/mysql/tests/mysql_field_name.phpt:1.4 Fri Nov 28 20:21:35 2008
+++ php-src/ext/mysql/tests/mysql_field_name.phpt Mon Jan 5 18:22:01 2009
@@ -45,17 +45,6 @@
Warning: mysql_field_name() expects exactly 2 parameters, 1 given in %s on
line %d
Warning: mysql_field_name(): Field -1 is invalid for MySQL result index %d in
%s on line %d
-string(2) "id"
-
-Warning: mysql_field_name(): Field 2 is invalid for MySQL result index %d in
%s on line %d
-
-Warning: mysql_field_name(): %d is not a valid MySQL result resource in %s on
line %d
-bool(false)
-done!
---UEXPECTF--
-Warning: Wrong parameter count for mysql_field_name() in %s on line %d
-
-Warning: mysql_field_name(): Field -1 is invalid for MySQL result index %d in
%s on line %d
unicode(2) "id"
Warning: mysql_field_name(): Field 2 is invalid for MySQL result index %d in
%s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_seek.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_seek.phpt
diff -u php-src/ext/mysql/tests/mysql_field_seek.phpt:1.3
php-src/ext/mysql/tests/mysql_field_seek.phpt:1.4
--- php-src/ext/mysql/tests/mysql_field_seek.phpt:1.3 Thu Aug 9 11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_field_seek.phpt Mon Jan 5 18:22:01 2009
@@ -43,103 +43,6 @@
Warning: mysql_field_seek(): Field -1 is invalid for MySQL result index %d in
%s on line %d
bool(false)
object(stdClass)#%d (13) {
- ["name"]=>
- string(2) "id"
- ["table"]=>
- string(4) "test"
- ["def"]=>
- string(0) ""
- ["max_length"]=>
- int(1)
- ["not_null"]=>
- int(1)
- ["primary_key"]=>
- int(1)
- ["multiple_key"]=>
- int(0)
- ["unique_key"]=>
- int(0)
- ["numeric"]=>
- int(1)
- ["blob"]=>
- int(0)
- ["type"]=>
- string(3) "int"
- ["unsigned"]=>
- int(0)
- ["zerofill"]=>
- int(0)
-}
-bool(true)
-object(stdClass)#%d (13) {
- ["name"]=>
- string(2) "id"
- ["table"]=>
- string(4) "test"
- ["def"]=>
- string(0) ""
- ["max_length"]=>
- int(1)
- ["not_null"]=>
- int(1)
- ["primary_key"]=>
- int(1)
- ["multiple_key"]=>
- int(0)
- ["unique_key"]=>
- int(0)
- ["numeric"]=>
- int(1)
- ["blob"]=>
- int(0)
- ["type"]=>
- string(3) "int"
- ["unsigned"]=>
- int(0)
- ["zerofill"]=>
- int(0)
-}
-bool(true)
-object(stdClass)#%d (13) {
- ["name"]=>
- string(5) "label"
- ["table"]=>
- string(4) "test"
- ["def"]=>
- string(0) ""
- ["max_length"]=>
- int(1)
- ["not_null"]=>
- int(0)
- ["primary_key"]=>
- int(0)
- ["multiple_key"]=>
- int(0)
- ["unique_key"]=>
- int(0)
- ["numeric"]=>
- int(0)
- ["blob"]=>
- int(0)
- ["type"]=>
- string(6) "string"
- ["unsigned"]=>
- int(0)
- ["zerofill"]=>
- int(0)
-}
-
-Warning: mysql_field_seek(): Field %d is invalid for MySQL result index %d in
%s on line %d
-bool(false)
-bool(false)
-
-Warning: mysql_field_seek(): %d is not a valid MySQL result resource in %s on
line %d
-bool(false)
-done!
---UEXPECTF--
-Warning: mysql_field_seek(): Field -1 is invalid for MySQL result index %d in
%s on line %d
-bool(false)
-object(stdClass)#%d (13) {
[u"name"]=>
unicode(2) "id"
[u"table"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_table.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_table.phpt
diff -u php-src/ext/mysql/tests/mysql_field_table.phpt:1.4
php-src/ext/mysql/tests/mysql_field_table.phpt:1.5
--- php-src/ext/mysql/tests/mysql_field_table.phpt:1.4 Fri Nov 28 20:21:35 2008
+++ php-src/ext/mysql/tests/mysql_field_table.phpt Mon Jan 5 18:22:01 2009
@@ -45,17 +45,6 @@
Warning: mysql_field_table() expects exactly 2 parameters, 1 given in %s on
line %d
Warning: mysql_field_table(): Field -1 is invalid for MySQL result index %d in
%s on line %d
-string(4) "test"
-
-Warning: mysql_field_table(): Field 2 is invalid for MySQL result index %d in
%s on line %d
-
-Warning: mysql_field_table(): %d is not a valid MySQL result resource in %s on
line %d
-bool(false)
-done!
---UEXPECTF--
-Warning: Wrong parameter count for mysql_field_table() in %s on line %d
-
-Warning: mysql_field_table(): Field -1 is invalid for MySQL result index %d in
%s on line %d
unicode(4) "test"
Warning: mysql_field_table(): Field 2 is invalid for MySQL result index %d in
%s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_type.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_type.phpt
diff -u php-src/ext/mysql/tests/mysql_field_type.phpt:1.4
php-src/ext/mysql/tests/mysql_field_type.phpt:1.5
--- php-src/ext/mysql/tests/mysql_field_type.phpt:1.4 Fri Nov 28 20:21:35 2008
+++ php-src/ext/mysql/tests/mysql_field_type.phpt Mon Jan 5 18:22:01 2009
@@ -45,17 +45,6 @@
Warning: mysql_field_type() expects exactly 2 parameters, 1 given in %s on
line %d
Warning: mysql_field_type(): Field -1 is invalid for MySQL result index %d in
%s on line %d
-string(3) "int"
-
-Warning: mysql_field_type(): Field 2 is invalid for MySQL result index %d in
%s on line %d
-
-Warning: mysql_field_type(): %d is not a valid MySQL result resource in %s on
line %d
-bool(false)
-done!
---UEXPECTF--
-Warning: Wrong parameter count for mysql_field_type() in %s on line %d
-
-Warning: mysql_field_type(): Field -1 is invalid for MySQL result index %d in
%s on line %d
unicode(3) "int"
Warning: mysql_field_type(): Field 2 is invalid for MySQL result index %d in
%s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconn_max_links.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_pconn_max_links.phpt
diff -u php-src/ext/mysql/tests/mysql_pconn_max_links.phpt:1.2
php-src/ext/mysql/tests/mysql_pconn_max_links.phpt:1.3
--- php-src/ext/mysql/tests/mysql_pconn_max_links.phpt:1.2 Wed Oct 10
10:55:52 2007
+++ php-src/ext/mysql/tests/mysql_pconn_max_links.phpt Mon Jan 5 18:22:01 2009
@@ -49,7 +49,7 @@
else if ($port)
$host = sprintf("%s:%s", $host, $port);
- if (!$plink = mysql_pconnect($host, 'pcontest', 'pcontest'))
+ if (!$plink = mysql_pconnect($host, $user, $passwd))
printf("[001] Cannot connect using the second DB user created
during SKIPIF, [%d] %s\n",
mysql_errno(), mysql_error());
@@ -141,20 +141,6 @@
?>
--EXPECTF--
array(2) {
- ["id"]=>
- string(1) "1"
- ["label"]=>
- string(1) "a"
-}
-array(2) {
- ["id"]=>
- string(1) "1"
- ["label"]=>
- string(1) "a"
-}
-done!
---UEXPECTF--
-array(2) {
[u"id"]=>
unicode(1) "1"
[u"label"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_query.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_query.phpt
diff -u php-src/ext/mysql/tests/mysql_query.phpt:1.4
php-src/ext/mysql/tests/mysql_query.phpt:1.5
--- php-src/ext/mysql/tests/mysql_query.phpt:1.4 Thu Aug 9 11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_query.phpt Mon Jan 5 18:22:01 2009
@@ -94,19 +94,6 @@
?>
--EXPECTF--
array(1) {
- ["valid"]=>
- string(30) "this is sql but with semicolon"
-}
-array(1) {
- [""]=>
- string(1) "a"
-}
-string(1) "a"
-
-Warning: mysql_query(): %d is not a valid MySQL-Link resource in %s on line %d
-done!
---UEXPECTF--
-array(1) {
[u"valid"]=>
unicode(30) "this is sql but with semicolon"
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_real_escape_string.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_real_escape_string.phpt
diff -u php-src/ext/mysql/tests/mysql_real_escape_string.phpt:1.3
php-src/ext/mysql/tests/mysql_real_escape_string.phpt:1.4
--- php-src/ext/mysql/tests/mysql_real_escape_string.phpt:1.3 Thu Aug 9
11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_real_escape_string.phpt Mon Jan 5
18:22:01 2009
@@ -33,15 +33,6 @@
print "done!";
?>
--EXPECTF--
-string(31) "Am I a unicode string in PHP 6?"
-string(2) "\\"
-string(2) "\""
-string(2) "\'"
-string(2) "\n"
-string(2) "\r"
-string(8) "foo\0bar"
-done!
---UEXPECTF--
unicode(31) "Am I a unicode string in PHP 6?"
unicode(2) "\\"
unicode(2) "\""
@@ -49,4 +40,4 @@
unicode(2) "\n"
unicode(2) "\r"
unicode(8) "foo\0bar"
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_result.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_result.phpt
diff -u php-src/ext/mysql/tests/mysql_result.phpt:1.4
php-src/ext/mysql/tests/mysql_result.phpt:1.5
--- php-src/ext/mysql/tests/mysql_result.phpt:1.4 Wed Oct 10 10:56:33 2007
+++ php-src/ext/mysql/tests/mysql_result.phpt Mon Jan 5 18:22:01 2009
@@ -73,54 +73,6 @@
Warning: mysql_result(): Bad column offset specified in %s on line %d
bool(false)
valid fields
-string(1) "1"
-string(1) "a"
-string(1) "1"
-string(1) "1"
-string(1) "a"
-string(1) "a"
-some invalid fields
-
-Warning: mysql_result(): unknown not found in MySQL result index %d in %s on
line %d
-bool(false)
-
-Warning: mysql_result(): _test. not found in MySQL result index %d in %s on
line %d
-bool(false)
-
-Warning: mysql_result(): not found in MySQL result index %d in %s on line %d
-bool(false)
-
-Warning: mysql_result(): _test. not found in MySQL result index %d in %s on
line %d
-bool(false)
-_id
-string(1) "1"
-_label
-string(2) "aa"
-_foo
-NULL
-
-Warning: mysql_result(): test.id not found in MySQL result index %d in %s on
line %d
-bool(false)
-
-Warning: mysql_result(): test.label not found in MySQL result index %d in %s
on line %d
-bool(false)
-
-Warning: mysql_result(): %d is not a valid MySQL result resource in %s on line
%d
-bool(false)
-done!
---UEXPECTF--
-Warning: mysql_result(): Unable to jump to row -1 on MySQL result index %d in
%s on line %d
-bool(false)
-
-Warning: mysql_result(): Unable to jump to row 2 on MySQL result index %d in
%s on line %d
-bool(false)
-
-Warning: mysql_result(): Bad column offset specified in %s on line %d
-bool(false)
-
-Warning: mysql_result(): Bad column offset specified in %s on line %d
-bool(false)
-valid fields
unicode(1) "1"
unicode(1) "a"
unicode(1) "1"
@@ -155,4 +107,4 @@
Warning: mysql_result(): %d is not a valid MySQL result resource in %s on line
%d
bool(false)
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_select_db.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_select_db.phpt
diff -u php-src/ext/mysql/tests/mysql_select_db.phpt:1.3
php-src/ext/mysql/tests/mysql_select_db.phpt:1.4
--- php-src/ext/mysql/tests/mysql_select_db.phpt:1.3 Thu Aug 9 11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_select_db.phpt Mon Jan 5 18:22:01 2009
@@ -66,12 +66,6 @@
print "done!\n";
?>
--EXPECTF--
-string(%d) "%s"
-bool(false)
-
-Warning: mysql_select_db(): %d is not a valid MySQL-Link resource in %s on
line %d
-done!
---UEXPECTF--
unicode(%d) "%s"
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_set_charset.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_set_charset.phpt
diff -u php-src/ext/mysql/tests/mysql_set_charset.phpt:1.2
php-src/ext/mysql/tests/mysql_set_charset.phpt:1.3
--- php-src/ext/mysql/tests/mysql_set_charset.phpt:1.2 Thu Aug 9 11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_set_charset.phpt Mon Jan 5 18:22:01 2009
@@ -53,7 +53,5 @@
print "done!";
?>
--EXPECTF--
-done!
---UEXPECTF--
Warning: mysql_set_charset(): Character set %s is not supported when running
PHP with unicode.semantics=On. in %s on line %d
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_tablename.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/tests/mysql_tablename.phpt
diff -u php-src/ext/mysql/tests/mysql_tablename.phpt:1.5
php-src/ext/mysql/tests/mysql_tablename.phpt:1.6
--- php-src/ext/mysql/tests/mysql_tablename.phpt:1.5 Fri Nov 28 20:21:35 2008
+++ php-src/ext/mysql/tests/mysql_tablename.phpt Mon Jan 5 18:22:01 2009
@@ -45,17 +45,6 @@
Warning: mysql_tablename() expects at least 2 parameters, 1 given in %s on
line %d
Warning: mysql_tablename(): Unable to jump to row -1 on MySQL result index %d
in %s on line %d
-string(1) "1"
-
-Warning: mysql_tablename(): Unable to jump to row 2 on MySQL result index %d
in %s on line %d
-
-Warning: mysql_tablename(): %d is not a valid MySQL result resource in %s on
line %d
-bool(false)
-done!
---UEXPECTF--
-Warning: Wrong parameter count for mysql_tablename() in %s on line %d
-
-Warning: mysql_tablename(): Unable to jump to row -1 on MySQL result index %d
in %s on line %d
unicode(1) "1"
Warning: mysql_tablename(): Unable to jump to row 2 on MySQL result index %d
in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_unbuffered_query.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_unbuffered_query.phpt
diff -u php-src/ext/mysql/tests/mysql_unbuffered_query.phpt:1.3
php-src/ext/mysql/tests/mysql_unbuffered_query.phpt:1.4
--- php-src/ext/mysql/tests/mysql_unbuffered_query.phpt:1.3 Thu Aug 9
11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_unbuffered_query.phpt Mon Jan 5 18:22:01 2009
@@ -88,19 +88,6 @@
?>
--EXPECTF--
array(1) {
- ["valid"]=>
- string(30) "this is sql but with semicolon"
-}
-bool(true)
-resource(%d) of type (mysql result)
-int(0)
-
-Notice: mysql_close(): Function called without first fetching all rows from a
previous unbuffered query in %s on line %d
-
-Warning: mysql_unbuffered_query(): %d is not a valid MySQL-Link resource in %s
on line %d
-done!
---UEXPECTF--
-array(1) {
[u"valid"]=>
unicode(30) "this is sql but with semicolon"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
