Fix failing tests

diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt
index 60ff8eac19bc9e6212fcb40e332939ca45ff274a..83a43e06b67d107a773d66409883d64db96d8d0c 100644 (file)
--- 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.14159274101)
+  float(3.141593)
   [1]=>
-  float(-9.99999997475E-7)
+  float(-1.0E-6)
   [2]=>
   float(0)
   [3]=>
-  float(999999995904)
+  float(1.0E+12)
   [4]=>
-  float(0.564642488956)
+  float(0.5646425)
   [5]=>
   float(1)
   [6]=>
-  float(8.88888914608E+14)
+  float(8.888889E+14)
 }
-done!
\ No newline at end of file
+done!

diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt
index db03abac83f91e61de4630e2ed73c3bd495672a7..b14516ff7814ef6fff792ed8338b208e479ebacf 100644 (file)
--- a/ext/mysqli/tests/011.phpt
+++ b/ext/mysqli/tests/011.phpt
@@ -67,7 +67,7 @@ array(8) {
   [3]=>
   int(4999999)
   [4]=>
-  float(2345.60009766)
+  float(2345.6)
   [5]=>
   float(5678.89563)
   [6]=>
@@ -75,4 +75,4 @@ array(8) {
   [7]=>
   %unicode|string%(11) "mysql rulez"
 }
-done!
\ No newline at end of file
+done!

diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt
index 7cc34b0c00ec7ccd1f32813d8555a855f9af7e9e..91abae48506c20a01f638effab2f8b9c8a4d7102 100644 (file)
--- a/ext/mysqli/tests/012.phpt
+++ b/ext/mysqli/tests/012.phpt
@@ -66,7 +66,7 @@ array(8) {
   [3]=>
   int(54)
   [4]=>
-  float(2.59999990463)
+  float(2.6)
   [5]=>
   float(58.89)
   [6]=>
@@ -74,4 +74,4 @@ array(8) {
   [7]=>
   %unicode|string%(3) "6.7"
 }
-done!
\ No newline at end of file
+done!

diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt
index bfea423c9e42e1b4af831abec83e79855e47fbd1..3bfb9ebf7d11a83afe16319b8acd32ddca17d35b 100644 (file)
--- a/ext/mysqli/tests/mysqli_change_user.phpt
+++ b/ext/mysqli/tests/mysqli_change_user.phpt
@@ -41,6 +41,11 @@ require_once('skipifconnectfailure.inc');
        if (false !== ($tmp = mysqli_change_user($link, $user, $passwd, $db . '_unknown_really')))
                printf("[009] Expecting false, got %s/%s\n", gettype($tmp), $tmp);
 
+       // Reconnect because after 3 failed change_user attempts, the server blocks you off.
+       if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+               printf("[006] 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($link, 'SET @mysqli_change_user_test_var=1'))
                printf("[010] Failed to set test variable: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
@@ -109,4 +114,4 @@ require_once('skipifconnectfailure.inc');
        print "done!";
 ?>
 --EXPECTF--
-done!
\ No newline at end of file
+done!

diff --git a/ext/mysqli/tests/mysqli_change_user_oo.phpt b/ext/mysqli/tests/mysqli_change_user_oo.phpt
index 61444ae2350b67c2e16bd51cadeff8b77441383e..96c8a698bb680bf9ff4442c10f4d2684b8e9c2eb 100644 (file)
--- a/ext/mysqli/tests/mysqli_change_user_oo.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_oo.phpt
@@ -43,6 +43,11 @@ if (!$IS_MYSQLND && (mysqli_get_server_version($link) < 50118 && mysqli_get_serv
        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);
 
@@ -81,4 +86,4 @@ if (!$IS_MYSQLND && (mysqli_get_server_version($link) < 50118 && mysqli_get_serv
        print "done!";
 ?>
 --EXPECTF--
-done!
\ No newline at end of file
+done!

diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
index 2fd1121a76ad0813ed05f506c2c77962c87063ac..991d3c345b126445f2be0d17b64520a87edc159f 100644 (file)
--- 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(1), PRIMARY
+       if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(3), PRIMARY
 KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=gbk")) {
                printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
 mysqli_error($link));

diff --git a/ext/mysqli/tests/table.inc b/ext/mysqli/tests/table.inc
index aa1207af444bbfc0ac1d2212cafb9607eff1476a..ec360c8f2cf861257d080dc6a2e22c403c2486c3 100644 (file)
--- a/ext/mysqli/tests/table.inc
+++ b/ext/mysqli/tests/table.inc
@@ -12,6 +12,11 @@ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
        exit(1);
 }
 
+if (!mysqli_query($link, 'SET SESSION sql_mode=\'\'')) {
+       printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+       exit(1);
+}
+
 if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine)) {
        printf("Failed to create test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
        exit(1);
@@ -20,4 +25,4 @@ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(i
 if (!mysqli_query($link, "INSERT INTO test(id, label) VALUES (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e'), (6, 'f')")) {
        printf("[%d] %s\n",  mysqli_errno($link), mysqli_error($link));
 }
-?>
\ No newline at end of file
+?>