Fixing mysqli_stmt_attr_set @ libmysql

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 6150f7179d201c89da5883192a641dc47359d1b2..690d6f0bcdae245e96991af775bcf6b933447dbd 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -2219,7 +2219,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
 
        mode = mode_in;
 #if !defined(MYSQLI_USE_MYSQLND)
-       if (FALSE == mysql_stmt_attr_set(stmt->stmt, attr, (void *)&mode)) {
+       if (mysql_stmt_attr_set(stmt->stmt, attr, (void *)&mode)) {
 #else
        if (FAIL == mysql_stmt_attr_set(stmt->stmt, attr, (void *)&mode)) {
 #endif

diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
index 5ff6e5e4583be4bfc5e69f6fdb19dd83759ba7d1..82e0121a3cdedf900f7cb5809b0288de0e533e3a 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
@@ -45,18 +45,15 @@ require_once('skipifconnectfailure.inc');
                printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        $stmt->prepare("SELECT * FROM test");
-       
-       mt_srand(microtime(true));
 
-       /* mysqlnd detects invalid attributes, libmysql does not AFAIK */
-       $invalid_ret = ($IS_MYSQLND) ? false : true;
+       mt_srand(microtime(true));
 
        for ($i = -100; $i < 1000; $i++) {
                if (in_array($i, $valid_attr))
                        continue;
                $invalid_attr = $i;
-               if ($invalid_ret !== ($tmp = @mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) {
-                       printf("[006a] Expecting boolean/%s for attribute %d, got %s/%s\n", $invalid_ret, $invalid_attr, gettype($tmp), $tmp);
+               if (false !== ($tmp = @mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) {
+                       printf("[006a] Expecting boolean/false for attribute %d, got %s/%s\n", $invalid_attr, gettype($tmp), $tmp);
                }
        }
 
@@ -64,8 +61,8 @@ require_once('skipifconnectfailure.inc');
                do {
                        $invalid_attr = mt_rand(-1 * (min(4294967296, PHP_INT_MAX) + 1), min(4294967296, PHP_INT_MAX));
                } while (in_array($invalid_attr, $valid_attr));
-               if ($invalid_ret !== ($tmp = @mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) {
-                       printf("[006b] Expecting boolean/%s for attribute %d, got %s/%s\n", $invalid_ret, $invalid_attr, gettype($tmp), $tmp);
+               if (false !== ($tmp = @mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) {
+                       printf("[006b] Expecting boolean/false for attribute %d, got %s/%s\n", $invalid_attr, gettype($tmp), $tmp);
                }
        }
        $stmt->close();