MFH

diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt
index 41b1ba2cf90fac40d0ff4109c2796b8a035e0e84..173c404909e8b28f2a3a6ddfdd33db08af696995 100644 (file)
--- a/ext/mysqli/tests/019.phpt
+++ b/ext/mysqli/tests/019.phpt
@@ -20,12 +20,13 @@ mysqli fetch (bind_param + bind_result)
                                                        col10 varchar(50),
                                                        col11 char(20))");
   
-       $stmt=  mysqli_prepare($link,"INSERT INTO insert_read(col1,col10, col11) VALUES(?,?,?)");
-       mysqli_bind_param($stmt, "iss", $c1, $c2, $c3);
+       $stmt=  mysqli_prepare($link,"INSERT INTO insert_read(col1,col10, col11, col6) VALUES(?,?,?,?)");
+       mysqli_bind_param($stmt, "issd", $c1, $c2, $c3, $c4);
 
        $c1 = 1;
        $c2 = "foo";
        $c3 = "foobar";
+       $c4 = 3.14;
 
        mysqli_execute($stmt);
        mysqli_stmt_close($stmt);
@@ -56,7 +57,7 @@ array(11) {
   [4]=>
   NULL
   [5]=>
-  NULL
+  float(3.14)
   [6]=>
   NULL
   [7]=>

diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 8663e8a64165cc587cbc9a57ad12322e4a8f78d5..4b5df98676ab20ba9ea57eef7be494e156ed3951 100644 (file)
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -20,15 +20,28 @@ mysqli_get_metadata
        mysqli_execute($stmt);
        $result = mysqli_get_metadata($stmt);
 
-       $fields = mysqli_fetch_fields($result);
+       echo "\n=== fetch_fields ===\n";
+       var_dump(mysqli_fetch_fields($result));
+
+       echo "\n=== fetch_field_direct ===\n";
+       var_dump(mysqli_fetch_field_direct($result, 0));
+       var_dump(mysqli_fetch_field_direct($result, 1));
+
+       echo "\n=== fetch_field ===\n";
+       while ($field = mysqli_fetch_field($result)) {
+               var_dump($field);
+       }
+    
+       print_r(mysqli_fetch_lengths($result));
+    
        mysqli_free_result($result);
 
-       var_dump($fields);
 
        mysqli_stmt_close($stmt);       
        mysqli_close($link);
 ?>
 --EXPECTF--
+=== fetch_fields ===
 array(2) {
   [0]=>
   object(stdClass)#5 (11) {
@@ -81,3 +94,103 @@ array(2) {
     int(0)
   }
 }
+
+=== fetch_field_direct ===
+object(stdClass)#6 (11) {
+  ["name"]=>
+  string(3) "foo"
+  ["orgname"]=>
+  string(3) "foo"
+  ["table"]=>
+  string(13) "test_affected"
+  ["orgtable"]=>
+  string(13) "test_affected"
+  ["def"]=>
+  string(0) ""
+  ["max_length"]=>
+  int(0)
+  ["length"]=>
+  int(11)
+  ["charsetnr"]=>
+  int(63)
+  ["flags"]=>
+  int(32768)
+  ["type"]=>
+  int(3)
+  ["decimals"]=>
+  int(0)
+}
+object(stdClass)#6 (11) {
+  ["name"]=>
+  string(3) "bar"
+  ["orgname"]=>
+  string(3) "bar"
+  ["table"]=>
+  string(13) "test_affected"
+  ["orgtable"]=>
+  string(13) "test_affected"
+  ["def"]=>
+  string(0) ""
+  ["max_length"]=>
+  int(0)
+  ["length"]=>
+  int(10)
+  ["charsetnr"]=>
+  int(8)
+  ["flags"]=>
+  int(0)
+  ["type"]=>
+  int(253)
+  ["decimals"]=>
+  int(0)
+}
+
+=== fetch_field ===
+object(stdClass)#6 (11) {
+  ["name"]=>
+  string(3) "foo"
+  ["orgname"]=>
+  string(3) "foo"
+  ["table"]=>
+  string(13) "test_affected"
+  ["orgtable"]=>
+  string(13) "test_affected"
+  ["def"]=>
+  string(0) ""
+  ["max_length"]=>
+  int(0)
+  ["length"]=>
+  int(11)
+  ["charsetnr"]=>
+  int(63)
+  ["flags"]=>
+  int(32768)
+  ["type"]=>
+  int(3)
+  ["decimals"]=>
+  int(0)
+}
+object(stdClass)#5 (11) {
+  ["name"]=>
+  string(3) "bar"
+  ["orgname"]=>
+  string(3) "bar"
+  ["table"]=>
+  string(13) "test_affected"
+  ["orgtable"]=>
+  string(13) "test_affected"
+  ["def"]=>
+  string(0) ""
+  ["max_length"]=>
+  int(0)
+  ["length"]=>
+  int(10)
+  ["charsetnr"]=>
+  int(8)
+  ["flags"]=>
+  int(0)
+  ["type"]=>
+  int(253)
+  ["decimals"]=>
+  int(0)
+}
\ No newline at end of file

diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt
index 44f9167c95dd92b74ae12b5728a358d4baf361f7..8ccb1e7e5360201927879350793d63a05df00904 100644 (file)
--- a/ext/mysqli/tests/bug33263.phpt
+++ b/ext/mysqli/tests/bug33263.phpt
@@ -2,6 +2,7 @@
 bug #33263 (mysqli_real_connect in __construct) 
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
+<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
 

diff --git a/ext/mysqli/tests/skipifnotemb.inc b/ext/mysqli/tests/skipifnotemb.inc
new file mode 100644 (file)
index 0000000..8639130
--- /dev/null
+++ b/ext/mysqli/tests/skipifnotemb.inc
@@ -0,0 +1,5 @@
+<?php
+  $driver = new mysqli_driver();
+  if (!$driver->embedded) 
+    die("skip test for with embedded server only");
+?>