georg Mon Dec 27 06:48:58 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
Fix for feature request #31015: added length for field length
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.95&r2=1.96&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.95
php-src/ext/mysqli/mysqli_api.c:1.96
--- php-src/ext/mysqli/mysqli_api.c:1.95 Mon Dec 20 11:39:14 2004
+++ php-src/ext/mysqli/mysqli_api.c Mon Dec 27 06:48:57 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.95 2004/12/20 16:39:14 georg Exp $
+ $Id: mysqli_api.c,v 1.96 2004/12/27 11:48:57 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -682,6 +682,8 @@
add_property_string(return_value, "orgtable",(field->org_table ?
field->org_table : ""), 1);
add_property_string(return_value, "def",(field->def ? field->def : ""),
1);
add_property_long(return_value, "max_length", field->max_length);
+ add_property_long(return_value, "length", field->length);
+ add_property_long(return_value, "charsetnr", field->charsetnr);
add_property_long(return_value, "flags", field->flags);
add_property_long(return_value, "type", field->type);
add_property_long(return_value, "decimals", field->decimals);
@@ -724,6 +726,8 @@
add_property_string(obj, "orgtable",(field->org_table ?
field->org_table : ""), 1);
add_property_string(obj, "def",(field->def ? field->def : ""),
1);
add_property_long(obj, "max_length", field->max_length);
+ add_property_long(obj, "length", field->length);
+ add_property_long(obj, "charsetnr", field->charsetnr);
add_property_long(obj, "flags", field->flags);
add_property_long(obj, "type", field->type);
add_property_long(obj, "decimals", field->decimals);
@@ -980,12 +984,12 @@
{
MY_MYSQL *mysql = (MY_MYSQL *)calloc(1, sizeof(MY_MYSQL));
- MYSQLI_RESOURCE *mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1,
sizeof(MYSQLI_RESOURCE));
-
if (!(mysql->mysql = mysql_init(NULL))) {
efree(mysql);
RETURN_FALSE;
}
+
+ 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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
