- Fixed tests (removed UEXPECT(F) section)

21 files changed, 9 insertions, 638 deletions

diff --git a/ext/mysql/tests/001.phpt b/ext/mysql/tests/001.phpt
index de39571904..97eca80a3f 100755
--- a/ext/mysql/tests/001.phpt
+++ b/ext/mysql/tests/001.phpt
@@ -25,9 +25,6 @@ mysql_close($db);
 var_dump($test);
 print "done!";
 ?>
---EXPECT--
-string(2) "11"
-done!
---UEXPECTF--
+--EXPECTF--
 unicode(2) "11"
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysql/tests/002.phpt b/ext/mysql/tests/002.phpt
index 9c1250104d..e5d68f265a 100755
--- a/ext/mysql/tests/002.phpt
+++ b/ext/mysql/tests/002.phpt
@@ -39,29 +39,6 @@ bool(true)
 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 @@ array(3) {
   [u"col3"]=>
   unicode(3) "bar"
 }
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysql/tests/003.phpt b/ext/mysql/tests/003.phpt
index 0c3717b294..5b21997822 100755
--- a/ext/mysql/tests/003.phpt
+++ b/ext/mysql/tests/003.phpt
@@ -55,37 +55,6 @@ print "done!";
 --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 @@ object(class24)#%d (1) {
   [u"a"]=>
   unicode(5) "three"
 }
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysql/tests/mysql_escape_string.phpt b/ext/mysql/tests/mysql_escape_string.phpt
index 1badea8903..6ff21e0eca 100644
--- a/ext/mysql/tests/mysql_escape_string.phpt
+++ b/ext/mysql/tests/mysql_escape_string.phpt
@@ -23,15 +23,6 @@ var_dump(mysql_escape_string("foo" . chr(0) . "bar"));
 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) "\'"
 unicode(2) "\n"
 unicode(2) "\r"
 unicode(8) "foo\0bar"
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysql/tests/mysql_fetch_array.phpt b/ext/mysql/tests/mysql_fetch_array.phpt
index 729523514a..42e17558f0 100644
--- a/ext/mysql/tests/mysql_fetch_array.phpt
+++ b/ext/mysql/tests/mysql_fetch_array.phpt
@@ -281,82 +281,6 @@ print "done!";
 [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"
diff --git a/ext/mysql/tests/mysql_fetch_assoc.phpt b/ext/mysql/tests/mysql_fetch_assoc.phpt
index 4479a2ab3e..b0d2e5ae1a 100644
--- a/ext/mysql/tests/mysql_fetch_assoc.phpt
+++ b/ext/mysql/tests/mysql_fetch_assoc.phpt
@@ -61,45 +61,6 @@ print "done!";
 --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"]=>
diff --git a/ext/mysql/tests/mysql_fetch_field.phpt b/ext/mysql/tests/mysql_fetch_field.phpt
index c46335f9d6..f9b4416190 100644
--- a/ext/mysql/tests/mysql_fetch_field.phpt
+++ b/ext/mysql/tests/mysql_fetch_field.phpt
@@ -135,125 +135,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --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"]=>
diff --git a/ext/mysql/tests/mysql_fetch_object.phpt b/ext/mysql/tests/mysql_fetch_object.phpt
index cc20f738b0..4771477b28 100644
--- a/ext/mysql/tests/mysql_fetch_object.phpt
+++ b/ext/mysql/tests/mysql_fetch_object.phpt
@@ -79,75 +79,6 @@ print "done!";
 ?>
 --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"]=>
diff --git a/ext/mysql/tests/mysql_fetch_row.phpt b/ext/mysql/tests/mysql_fetch_row.phpt
index d9fff217ad..09a44abb0a 100644
--- a/ext/mysql/tests/mysql_fetch_row.phpt
+++ b/ext/mysql/tests/mysql_fetch_row.phpt
@@ -40,20 +40,6 @@ print "done!";
 [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"
diff --git a/ext/mysql/tests/mysql_field_name.phpt b/ext/mysql/tests/mysql_field_name.phpt
index aeb516c8bb..d59e0e59d1 100644
--- a/ext/mysql/tests/mysql_field_name.phpt
+++ b/ext/mysql/tests/mysql_field_name.phpt
@@ -45,17 +45,6 @@ print "done!";
 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
diff --git a/ext/mysql/tests/mysql_field_seek.phpt b/ext/mysql/tests/mysql_field_seek.phpt
index e5105d984d..1d401bc4e3 100644
--- a/ext/mysql/tests/mysql_field_seek.phpt
+++ b/ext/mysql/tests/mysql_field_seek.phpt
@@ -43,103 +43,6 @@ print "done!";
 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"]=>
diff --git a/ext/mysql/tests/mysql_field_table.phpt b/ext/mysql/tests/mysql_field_table.phpt
index 5e552f8ee5..05d59180e1 100644
--- a/ext/mysql/tests/mysql_field_table.phpt
+++ b/ext/mysql/tests/mysql_field_table.phpt
@@ -45,17 +45,6 @@ print "done!";
 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
diff --git a/ext/mysql/tests/mysql_field_type.phpt b/ext/mysql/tests/mysql_field_type.phpt
index 2a72e2de88..995e828cd6 100644
--- a/ext/mysql/tests/mysql_field_type.phpt
+++ b/ext/mysql/tests/mysql_field_type.phpt
@@ -45,17 +45,6 @@ print "done!";
 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
diff --git a/ext/mysql/tests/mysql_pconn_max_links.phpt b/ext/mysql/tests/mysql_pconn_max_links.phpt
index b5b0a3a56c..b33fb4f0ba 100644
--- a/ext/mysql/tests/mysql_pconn_max_links.phpt
+++ b/ext/mysql/tests/mysql_pconn_max_links.phpt
@@ -49,7 +49,7 @@ mysql.allow_persistent=1
 	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 @@ mysql.allow_persistent=1
 ?>
 --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"]=>
diff --git a/ext/mysql/tests/mysql_query.phpt b/ext/mysql/tests/mysql_query.phpt
index d1d4dfb8e9..4e6907f75c 100644
--- a/ext/mysql/tests/mysql_query.phpt
+++ b/ext/mysql/tests/mysql_query.phpt
@@ -94,19 +94,6 @@ print "done!";
 ?>
 --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"
 }
diff --git a/ext/mysql/tests/mysql_real_escape_string.phpt b/ext/mysql/tests/mysql_real_escape_string.phpt
index 511da068bd..5877e50355 100644
--- a/ext/mysql/tests/mysql_real_escape_string.phpt
+++ b/ext/mysql/tests/mysql_real_escape_string.phpt
@@ -33,15 +33,6 @@ assert($tmp === mysql_real_escape_string("foo" . chr(0) . "bar"));
 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) "\'"
 unicode(2) "\n"
 unicode(2) "\r"
 unicode(8) "foo\0bar"
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysql/tests/mysql_result.phpt b/ext/mysql/tests/mysql_result.phpt
index 4217b2e390..653e60626b 100644
--- a/ext/mysql/tests/mysql_result.phpt
+++ b/ext/mysql/tests/mysql_result.phpt
@@ -73,54 +73,6 @@ bool(false)
 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 @@ bool(false)
 
 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!
diff --git a/ext/mysql/tests/mysql_select_db.phpt b/ext/mysql/tests/mysql_select_db.phpt
index 3391fa6e95..90635ae39e 100644
--- a/ext/mysql/tests/mysql_select_db.phpt
+++ b/ext/mysql/tests/mysql_select_db.phpt
@@ -66,12 +66,6 @@ if (false !== ($tmp = mysql_select_db($db, $link)))
 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)
 
diff --git a/ext/mysql/tests/mysql_set_charset.phpt b/ext/mysql/tests/mysql_set_charset.phpt
index 0fbff44e88..19d503c9a8 100644
--- a/ext/mysql/tests/mysql_set_charset.phpt
+++ b/ext/mysql/tests/mysql_set_charset.phpt
@@ -53,7 +53,5 @@ mysql_close($link);
 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!
diff --git a/ext/mysql/tests/mysql_tablename.phpt b/ext/mysql/tests/mysql_tablename.phpt
index 684734a7d0..d9c39cac25 100644
--- a/ext/mysql/tests/mysql_tablename.phpt
+++ b/ext/mysql/tests/mysql_tablename.phpt
@@ -45,17 +45,6 @@ print "done!";
 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
diff --git a/ext/mysql/tests/mysql_unbuffered_query.phpt b/ext/mysql/tests/mysql_unbuffered_query.phpt
index 6701ce52a0..9979a9cce6 100644
--- a/ext/mysql/tests/mysql_unbuffered_query.phpt
+++ b/ext/mysql/tests/mysql_unbuffered_query.phpt
@@ -88,19 +88,6 @@ print "done!";
 ?>
 --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"
 }