Skip to content

Commit c2a047c

Browse files
committed
Revert "Fix failing tests"
This fix break test due to precision setting This reverts commit 4e2c016. Conflicts: ext/mysqli/tests/mysqli_change_user.phpt ext/mysqli/tests/table.inc
1 parent 31e978f commit c2a047c

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

ext/mysqli/tests/010.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ mysqli_close($link);
6262
--EXPECT--
6363
array(7) {
6464
[0]=>
65-
float(3.141593)
65+
float(3.14159274101)
6666
[1]=>
67-
float(-1.0E-6)
67+
float(-9.99999997475E-7)
6868
[2]=>
6969
float(0)
7070
[3]=>
71-
float(1.0E+12)
71+
float(999999995904)
7272
[4]=>
73-
float(0.5646425)
73+
float(0.564642488956)
7474
[5]=>
7575
float(1)
7676
[6]=>
77-
float(8.888889E+14)
77+
float(8.88888914608E+14)
7878
}
79-
done!
79+
done!

ext/mysqli/tests/011.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ array(8) {
6767
[3]=>
6868
int(4999999)
6969
[4]=>
70-
float(2345.6)
70+
float(2345.60009766)
7171
[5]=>
7272
float(5678.89563)
7373
[6]=>
7474
string(6) "foobar"
7575
[7]=>
7676
%unicode|string%(11) "mysql rulez"
7777
}
78-
done!
78+
done!

ext/mysqli/tests/012.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ array(8) {
6666
[3]=>
6767
int(54)
6868
[4]=>
69-
float(2.6)
69+
float(2.59999990463)
7070
[5]=>
7171
float(58.89)
7272
[6]=>
7373
string(3) "206"
7474
[7]=>
7575
%unicode|string%(3) "6.7"
7676
}
77-
done!
77+
done!

ext/mysqli/tests/mysqli_change_user_oo.phpt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ if (mysqli_get_server_version($link) >= 50600)
4646
if (false !== ($tmp = $mysqli->change_user($user, $passwd, $db . '_unknown_really')))
4747
printf("[008] Expecting false, got %s/%s\n", gettype($tmp), $tmp);
4848

49-
// Reconnect because after 3 failed change_user attempts, the server blocks you off.
50-
if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
51-
printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
52-
$host, $user, $db, $port, $socket);
53-
5449
if (!$mysqli->query('SET @mysqli_change_user_test_var=1'))
5550
printf("[009] Failed to set test variable: [%d] %s\n", $mysqli->errno, $mysqli->error);
5651

ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $port, $socket, mysqli_connect_errno(), mysqli_connect_error());
3636
mysqli_error($link));
3737
}
3838

39-
if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(3), PRIMARY
39+
if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
4040
KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=gbk")) {
4141
printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
4242
mysqli_error($link));

0 commit comments

Comments
 (0)