uw Mon, 17 Jan 2011 13:06:44 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307535
Log: Fix tests: don't expect people to use a certain db/schema for testing Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/047.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_direct.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_oo.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_fields.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_seek.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_tell.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt U php/php-src/trunk/ext/mysqli/tests/047.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_field_tell.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/047.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/047.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/047.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -72,9 +72,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -101,9 +101,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -132,9 +132,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -160,9 +160,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -190,9 +190,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -218,9 +218,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -44,6 +44,10 @@ $charsets['results']['maxlen'], $tmp->max_length); } + if ($tmp->db != $db) { + printf("011] Expecting database '%s' got '%s'\n", + $db, $tmp->db); + } var_dump(mysqli_fetch_field($res)); @@ -87,13 +91,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> @@ -115,13 +119,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> @@ -148,15 +152,15 @@ [%u|b%"orgname"]=> %unicode|string%(2) "id" [%u|b%"table"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_direct.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_direct.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_direct.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -59,9 +59,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -64,13 +64,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_oo.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -47,6 +47,10 @@ $charsets['results']['maxlen'], $tmp->max_length); } + if ($tmp->db != $db) { + printf("008] Expecting database '%s' got '%s'\n", + $db, $tmp->db); + } var_dump($res->fetch_field()); @@ -75,9 +79,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> @@ -103,9 +107,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_fields.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_fields.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_fields.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -68,13 +68,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> @@ -96,13 +96,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_seek.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_seek.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_seek.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -134,9 +134,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -163,9 +163,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -192,9 +192,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> @@ -231,7 +231,7 @@ [%u|b%"db"]=> %unicode|string%(0) "" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_tell.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_tell.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_tell.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -76,9 +76,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -73,9 +73,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -101,9 +101,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> @@ -131,7 +131,7 @@ [%u|b%"db"]=> %unicode|string%(0) "" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -159,7 +159,7 @@ [%u|b%"db"]=> %unicode|string%(0) "" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -113,9 +113,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/047.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/047.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/047.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -72,9 +72,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -101,9 +101,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -132,9 +132,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -160,9 +160,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -190,9 +190,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -218,9 +218,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -44,6 +44,10 @@ $charsets['results']['maxlen'], $tmp->max_length); } + if ($tmp->db != $db) { + printf("011] Expecting database '%s' got '%s'\n", + $db, $tmp->db); + } var_dump(mysqli_fetch_field($res)); @@ -87,13 +91,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> @@ -115,13 +119,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> @@ -148,15 +152,15 @@ [%u|b%"orgname"]=> %unicode|string%(2) "id" [%u|b%"table"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -59,9 +59,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -64,13 +64,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -47,6 +47,10 @@ $charsets['results']['maxlen'], $tmp->max_length); } + if ($tmp->db != $db) { + printf("008] Expecting database '%s' got '%s'\n", + $db, $tmp->db); + } var_dump($res->fetch_field()); @@ -75,9 +79,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> @@ -103,9 +107,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -68,13 +68,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> @@ -96,13 +96,13 @@ [%u|b%"table"]=> %unicode|string%(4) "TEST" [%u|b%"orgtable"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -134,9 +134,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -163,9 +163,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -192,9 +192,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> @@ -231,7 +231,7 @@ [%u|b%"db"]=> %unicode|string%(0) "" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_field_tell.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_field_tell.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_field_tell.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -76,9 +76,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -73,9 +73,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -101,9 +101,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> @@ -131,7 +131,7 @@ [%u|b%"db"]=> %unicode|string%(0) "" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> @@ -159,7 +159,7 @@ [%u|b%"db"]=> %unicode|string%(0) "" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(%d) [%u|b%"length"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt 2011-01-17 12:50:43 UTC (rev 307534) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt 2011-01-17 13:06:44 UTC (rev 307535) @@ -113,9 +113,9 @@ [%u|b%"def"]=> %unicode|string%(0) "" [%u|b%"db"]=> - %unicode|string%(4) "test" + %unicode|string%(%d) "%s" [%u|b%"catalog"]=> - %unicode|string%(3) "def" + %unicode|string%(%d) "%s" [%u|b%"max_length"]=> int(0) [%u|b%"length"]=>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php