summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2008-04-16 12:57:38 +0000
committerAndrey Hristov <andrey@php.net>2008-04-16 12:57:38 +0000
commitde560f3161495f2287a6673b61a074b798585720 (patch)
tree05fbc85ba4f0985f2526ad393aeee79acac87ab2 /ext/mysql/php_mysql.c
parent0a3a57bc0552be34a6d762390528a4512334f9b8 (diff)
downloadphp-git-de560f3161495f2287a6673b61a074b798585720.tar.gz
MFB: Update CVS from the development tree
Diffstat (limited to 'ext/mysql/php_mysql.c')
-rw-r--r--ext/mysql/php_mysql.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 16da0115c7..140d945003 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1871,7 +1871,7 @@ PHP_FUNCTION(mysql_result)
switch(Z_TYPE_PP(field)) {
case IS_STRING: {
int i=0;
- MYSQL_FIELD *tmp_field;
+ const MYSQL_FIELD *tmp_field;
char *table_name, *field_name, *tmp;
if ((tmp=strchr(Z_STRVAL_PP(field), '.'))) {
@@ -2375,7 +2375,7 @@ PHP_FUNCTION(mysql_fetch_field)
{
zval **result, **field=NULL;
MYSQL_RES *mysql_result;
- MYSQL_FIELD *mysql_field;
+ const MYSQL_FIELD *mysql_field;
switch (ZEND_NUM_ARGS()) {
case 1:
@@ -2460,7 +2460,7 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
{
zval **result, **field;
MYSQL_RES *mysql_result;
- MYSQL_FIELD *mysql_field = {0};
+ const MYSQL_FIELD *mysql_field = {0};
char buf[512];
int len;