Fixing borked test, again new run-tests.php has found it... Fails with HEAD, passes with 5.3

1 files changed, 64 insertions, 162 deletions

diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
index 12489cef5d..2e323ee1f6 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
@@ -41,197 +41,99 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --EXPECTF--
 object(stdClass)#%d (11) {
-  ["name"]=>
-  string(2) "id"
-  ["orgname"]=>
-  string(2) "id"
-  ["table"]=>
-  string(4) "test"
-  ["orgtable"]=>
-  string(4) "test"
-  ["def"]=>
-  string(0) ""
-  ["max_length"]=>
+  [%u|b%"name"]=>
+  %unicode|string%(2) "id"
+  [%u|b%"orgname"]=>
+  %unicode|string%(2) "id"
+  [%u|b%"table"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"orgtable"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
   int(0)
-  ["length"]=>
+  [%u|b%"length"]=>
   int(11)
-  ["charsetnr"]=>
+  [%u|b%"charsetnr"]=>
   int(63)
-  ["flags"]=>
+  [%u|b%"flags"]=>
   int(49155)
-  ["type"]=>
+  [%u|b%"type"]=>
   int(3)
-  ["decimals"]=>
+  [%u|b%"decimals"]=>
   int(0)
 }
 object(stdClass)#%d (11) {
-  ["name"]=>
-  string(5) "label"
-  ["orgname"]=>
-  string(5) "label"
-  ["table"]=>
-  string(4) "test"
-  ["orgtable"]=>
-  string(4) "test"
-  ["def"]=>
-  string(0) ""
-  ["max_length"]=>
+  [%u|b%"name"]=>
+  %unicode|string%(5) "label"
+  [%u|b%"orgname"]=>
+  %unicode|string%(5) "label"
+  [%u|b%"table"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"orgtable"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
   int(1)
-  ["length"]=>
+  [%u|b%"length"]=>
   int(1)
-  ["charsetnr"]=>
+  [%u|b%"charsetnr"]=>
   int(8)
-  ["flags"]=>
+  [%u|b%"flags"]=>
   int(0)
-  ["type"]=>
+  [%u|b%"type"]=>
   int(254)
-  ["decimals"]=>
+  [%u|b%"decimals"]=>
   int(0)
 }
 object(stdClass)#%d (11) {
-  ["name"]=>
-  string(3) "_id"
-  ["orgname"]=>
-  string(0) ""
-  ["table"]=>
-  string(0) ""
-  ["orgtable"]=>
-  string(0) ""
-  ["def"]=>
-  string(0) ""
-  ["max_length"]=>
+  [%u|b%"name"]=>
+  %unicode|string%(3) "_id"
+  [%u|b%"orgname"]=>
+  %unicode|string%(0) ""
+  [%u|b%"table"]=>
+  %unicode|string%(0) ""
+  [%u|b%"orgtable"]=>
+  %unicode|string%(0) ""
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
   int(0)
-  ["length"]=>
+  [%u|b%"length"]=>
   int(%d)
-  ["charsetnr"]=>
+  [%u|b%"charsetnr"]=>
   int(63)
-  ["flags"]=>
+  [%u|b%"flags"]=>
   int(32897)
-  ["type"]=>
+  [%u|b%"type"]=>
   int(8)
-  ["decimals"]=>
+  [%u|b%"decimals"]=>
   int(0)
 }
 object(stdClass)#%d (11) {
-  ["name"]=>
-  string(8) "___label"
-  ["orgname"]=>
-  string(0) ""
-  ["table"]=>
-  string(0) ""
-  ["orgtable"]=>
-  string(0) ""
-  ["def"]=>
-  string(0) ""
-  ["max_length"]=>
+  [%u|b%"name"]=>
+  %unicode|string%(8) "___label"
+  [%u|b%"orgname"]=>
+  %unicode|string%(0) ""
+  [%u|b%"table"]=>
+  %unicode|string%(0) ""
+  [%u|b%"orgtable"]=>
+  %unicode|string%(0) ""
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
   int(2)
-  ["length"]=>
+  [%u|b%"length"]=>
   int(2)
-  ["charsetnr"]=>
+  [%u|b%"charsetnr"]=>
   int(8)
-  ["flags"]=>
+  [%u|b%"flags"]=>
   int(0)
-  ["type"]=>
+  [%u|b%"type"]=>
   int(253)
-  ["decimals"]=>
-  int(31)
-}
-done!
---UEXPECTF--
-object(stdClass)#%d (11) {
-  [u"name"]=>
-  unicode(2) "id"
-  [u"orgname"]=>
-  unicode(2) "id"
-  [u"table"]=>
-  unicode(4) "test"
-  [u"orgtable"]=>
-  unicode(4) "test"
-  [u"def"]=>
-  unicode(0) ""
-  [u"max_length"]=>
-  int(0)
-  [u"length"]=>
-  int(11)
-  [u"charsetnr"]=>
-  int(63)
-  [u"flags"]=>
-  int(49155)
-  [u"type"]=>
-  int(3)
-  [u"decimals"]=>
-  int(0)
-}
-object(stdClass)#%d (11) {
-  [u"name"]=>
-  unicode(5) "label"
-  [u"orgname"]=>
-  unicode(5) "label"
-  [u"table"]=>
-  unicode(4) "test"
-  [u"orgtable"]=>
-  unicode(4) "test"
-  [u"def"]=>
-  unicode(0) ""
-  [u"max_length"]=>
-  int(1)
-  [u"length"]=>
-  int(3)
-  [u"charsetnr"]=>
-  int(33)
-  [u"flags"]=>
-  int(0)
-  [u"type"]=>
-  int(254)
-  [u"decimals"]=>
-  int(0)
-}
-object(stdClass)#%d (11) {
-  [u"name"]=>
-  unicode(3) "_id"
-  [u"orgname"]=>
-  unicode(0) ""
-  [u"table"]=>
-  unicode(0) ""
-  [u"orgtable"]=>
-  unicode(0) ""
-  [u"def"]=>
-  unicode(0) ""
-  [u"max_length"]=>
-  int(0)
-  [u"length"]=>
-  int(%d)
-  [u"charsetnr"]=>
-  int(63)
-  [u"flags"]=>
-  int(32897)
-  [u"type"]=>
-  int(8)
-  [u"decimals"]=>
-  int(0)
-}
-object(stdClass)#%d (11) {
-  [u"name"]=>
-  unicode(8) "___label"
-  [u"orgname"]=>
-  unicode(0) ""
-  [u"table"]=>
-  unicode(0) ""
-  [u"orgtable"]=>
-  unicode(0) ""
-  [u"def"]=>
-  unicode(0) ""
-  [u"max_length"]=>
-  int(2)
-  [u"length"]=>
-  int(6)
-  [u"charsetnr"]=>
-  int(33)
-  [u"flags"]=>
-  int(0)
-  [u"type"]=>
-  int(253)
-  [u"decimals"]=>
+  [%u|b%"decimals"]=>
   int(31)
 }
 done!
\ No newline at end of file