com php-src: Revert "Fix failing tests": ext/mysqli/tests/010.phpt ext/mysqli/tests/011.phpt ext/mysqli/tests/012.phpt
ext/mysqli/tests/mysqli_change_user_oo.phpt ext/mysql i/tests/mysqli_real_escape_string_gbk.phpt

Commit: c2a047cf99f3d020bab12701e8dafed7424673bf Author: Xinchen Hui <laruence@php.net> Thu, 25 Dec 2014 00:36:26 -0500 Parents: 31e978ff5ccade5f0ddc43c40d263c2f719eec40 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c2a047cf99f3d020bab12701e8dafed7424673bf Log: Revert "Fix failing tests" This fix break test due to precision setting This reverts commit 4e2c01617f207c039881f635d3beb77eff0d9669. Conflicts: ext/mysqli/tests/mysqli_change_user.phpt ext/mysqli/tests/table.inc Changed paths: M ext/mysqli/tests/010.phpt M ext/mysqli/tests/011.phpt M ext/mysqli/tests/012.phpt M ext/mysqli/tests/mysqli_change_user_oo.phpt M ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt Diff: diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt index 83a43e0...60ff8ea 100644 --- a/ext/mysqli/tests/010.phpt +++ b/ext/mysqli/tests/010.phpt @@ -62,18 +62,18 @@ mysqli_close($link); --EXPECT-- array(7) { [0]=> - float(3.141593) + float(3.14159274101) [1]=> - float(-1.0E-6) + float(-9.99999997475E-7) [2]=> float(0) [3]=> - float(1.0E+12) + float(999999995904) [4]=> - float(0.5646425) + float(0.564642488956) [5]=> float(1) [6]=> - float(8.888889E+14) + float(8.88888914608E+14) } -done! +done! \ No newline at end of file diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt index b14516f..db03aba 100644 --- a/ext/mysqli/tests/011.phpt +++ b/ext/mysqli/tests/011.phpt @@ -67,7 +67,7 @@ array(8) { [3]=> int(4999999) [4]=> - float(2345.6) + float(2345.60009766) [5]=> float(5678.89563) [6]=> @@ -75,4 +75,4 @@ array(8) { [7]=> %unicode|string%(11) "mysql rulez" } -done! +done! \ No newline at end of file diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt index 91abae4..7cc34b0 100644 --- a/ext/mysqli/tests/012.phpt +++ b/ext/mysqli/tests/012.phpt @@ -66,7 +66,7 @@ array(8) { [3]=> int(54) [4]=> - float(2.6) + float(2.59999990463) [5]=> float(58.89) [6]=> @@ -74,4 +74,4 @@ array(8) { [7]=> %unicode|string%(3) "6.7" } -done! +done! \ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_oo.phpt b/ext/mysqli/tests/mysqli_change_user_oo.phpt index 34a3e51..81712ea 100644 --- a/ext/mysqli/tests/mysqli_change_user_oo.phpt +++ b/ext/mysqli/tests/mysqli_change_user_oo.phpt @@ -46,11 +46,6 @@ if (mysqli_get_server_version($link) >= 50600) if (false !== ($tmp = $mysqli->change_user($user, $passwd, $db . '_unknown_really'))) printf("[008] Expecting false, got %s/%s\n", gettype($tmp), $tmp); - // Reconnect because after 3 failed change_user attempts, the server blocks you off. - if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) - printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", - $host, $user, $db, $port, $socket); - if (!$mysqli->query('SET @mysqli_change_user_test_var=1')) printf("[009] Failed to set test variable: [%d] %s\n", $mysqli->errno, $mysqli->error); diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt index 53424e6..ee84c86 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt @@ -36,7 +36,7 @@ $port, $socket, mysqli_connect_errno(), mysqli_connect_error()); mysqli_error($link)); } - if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(3), PRIMARY + if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=gbk")) { printf("Failed to create test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));