fixed testcase 047

fixed windows compile error

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index ee108494706611e815569c5af902b586b813bb8c..3c1be87314427bc0df6f804ca496ffde3a5b6beb 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -982,6 +982,7 @@ PHP_FUNCTION(mysqli_info)
    Initialize mysqli and return a resource for use with mysql_real_connect */
 PHP_FUNCTION(mysqli_init)
 {
+       MYSQLI_RESOURCE *mysqli_resource;
        MY_MYSQL *mysql = (MY_MYSQL *)calloc(1, sizeof(MY_MYSQL));
 
        if (!(mysql->mysql = mysql_init(NULL))) {
@@ -989,7 +990,7 @@ PHP_FUNCTION(mysqli_init)
                RETURN_FALSE;
        }
 
-       MYSQLI_RESOURCE *mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
+       mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
        mysqli_resource->ptr = (void *)mysql;
        MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);       
 }

diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 56acddd6887cde1ae29f717e549a3d4509b0550c..d6ccb0df37051fda53b410192c0df7f2e01f7808 100644 (file)
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -12,7 +12,7 @@ mysqli_get_metadata
        mysqli_select_db($link, "test");
 
        mysqli_query($link, "DROP TABLE IF EXISTS test_affected");
-       mysqli_query($link, "CREATE TABLE test_affected (foo int, bar varchar(10))");
+       mysqli_query($link, "CREATE TABLE test_affected (foo int, bar varchar(10) character set latin1)");
 
        mysqli_query($link, "INSERT INTO test_affected VALUES (1, 'Zak'),(2, 'Greant')");
 
@@ -31,7 +31,7 @@ mysqli_get_metadata
 --EXPECTF--
 array(2) {
   [0]=>
-  object(stdClass)#%d (9) {
+  object(stdClass)#4 (11) {
     ["name"]=>
     string(3) "foo"
     ["orgname"]=>
@@ -44,6 +44,10 @@ array(2) {
     string(0) ""
     ["max_length"]=>
     int(0)
+    ["length"]=>
+    int(11)
+    ["charsetnr"]=>
+    int(63)
     ["flags"]=>
     int(32768)
     ["type"]=>
@@ -52,7 +56,7 @@ array(2) {
     int(0)
   }
   [1]=>
-  object(stdClass)#%d (9) {
+  object(stdClass)#5 (11) {
     ["name"]=>
     string(3) "bar"
     ["orgname"]=>
@@ -65,6 +69,10 @@ array(2) {
     string(0) ""
     ["max_length"]=>
     int(0)
+    ["length"]=>
+    int(10)
+    ["charsetnr"]=>
+    int(8)
     ["flags"]=>
     int(0)
     ["type"]=>