Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
Hi Pierre 2009/5/23 Pierre Joye : > On Sat, May 23, 2009 at 4:58 AM, Kalle Sommer Nielsen wrote: >> kalle Sat May 23 02:58:16 2009 UTC >> >> Modified files: (Branch: PHP_5_3) >> /php-src/ext/mysqli mysqli_api.c >> Log: >> Fixed compiler warning again, uint8_t is only available with mysqlnd. This >> is not affecting HEAD > > this type and all other are available in stdint.h and > win32/php_stdint.h on windows. Yea I know, but mysql_refresh in libmysql expects unsigned int, so I thought this was the best solution. > > Cheers, > -- > Pierre > > http://blog.thepimp.net | http://www.libgd.org > regrads, -- Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
On Sat, May 23, 2009 at 4:58 AM, Kalle Sommer Nielsen wrote: > kalle Sat May 23 02:58:16 2009 UTC > > Modified files: (Branch: PHP_5_3) > /php-src/ext/mysqli mysqli_api.c > Log: > Fixed compiler warning again, uint8_t is only available with mysqlnd. This > is not affecting HEAD this type and all other are available in stdint.h and win32/php_stdint.h on windows. Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
kalle Sat May 23 02:58:16 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli_api.c Log: Fixed compiler warning again, uint8_t is only available with mysqlnd. This is not affecting HEAD http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.26&r2=1.118.2.22.2.16.2.27&diff_format=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.26 php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.27 --- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.26Wed May 20 13:10:49 2009 +++ php-src/ext/mysqli/mysqli_api.c Sat May 23 02:58:15 2009 @@ -17,7 +17,7 @@ | Ulf Wendel | +--+ - $Id: mysqli_api.c,v 1.118.2.22.2.16.2.26 2009/05/20 13:10:49 iliaa Exp $ + $Id: mysqli_api.c,v 1.118.2.22.2.16.2.27 2009/05/23 02:58:15 kalle Exp $ */ #ifdef HAVE_CONFIG_H @@ -2081,7 +2081,11 @@ return; } MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_INITIALIZED); +#ifdef MYSQLI_USE_MYSQLND + RETURN_BOOL(!mysql_refresh(mysql->mysql, (uint8_t) options)); +#else RETURN_BOOL(!mysql_refresh(mysql->mysql, options)); +#endif } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
iliaa Wed May 20 13:10:49 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli_api.c Log: Fixed build http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.25&r2=1.118.2.22.2.16.2.26&diff_format=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.25 php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.26 --- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.25Wed May 20 08:30:12 2009 +++ php-src/ext/mysqli/mysqli_api.c Wed May 20 13:10:49 2009 @@ -17,7 +17,7 @@ | Ulf Wendel | +--+ - $Id: mysqli_api.c,v 1.118.2.22.2.16.2.25 2009/05/20 08:30:12 kalle Exp $ + $Id: mysqli_api.c,v 1.118.2.22.2.16.2.26 2009/05/20 13:10:49 iliaa Exp $ */ #ifdef HAVE_CONFIG_H @@ -2081,7 +2081,7 @@ return; } MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_INITIALIZED); - RETURN_BOOL(!mysql_refresh(mysql->mysql, (uint8_t) options)); + RETURN_BOOL(!mysql_refresh(mysql->mysql, options)); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c /ext/mysqli/tests bug46109.phpt
andrey Fri Sep 19 11:38:46 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests bug46109.phpt
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
MFH:Fix for bug#46019 MySQLi::init() leaks memory
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.20&r2=1.118.2.22.2.16.2.21&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.20
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.21
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.20Sat Aug 2
04:46:06 2008
+++ php-src/ext/mysqli/mysqli_api.c Fri Sep 19 11:38:46 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.20 2008/08/02 04:46:06 felipe Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.21 2008/09/19 11:38:46 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1311,7 +1311,13 @@
PHP_FUNCTION(mysqli_init)
{
MYSQLI_RESOURCE *mysqli_resource;
- MY_MYSQL *mysql = (MY_MYSQL *)ecalloc(1, sizeof(MY_MYSQL));
+ MY_MYSQL *mysql;
+
+ if (getThis() && instanceof_function(Z_OBJCE_P(getThis()),
mysqli_link_class_entry TSRMLS_CC)) {
+ return;
+ }
+
+ mysql = (MY_MYSQL *)ecalloc(1, sizeof(MY_MYSQL));
#if !defined(MYSQLI_USE_MYSQLND)
if (!(mysql->mysql = mysql_init(NULL)))
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug46109.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/bug46109.phpt
+++ php-src/ext/mysqli/tests/bug46109.phpt
--TEST--
Bug #46109 (MySQLi::init - Memory leaks)
--SKIPIF--
--FILE--
init();
$mysqli->init();
echo "done";
?>
--EXPECTF--
done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c /ext/mysqli/tests bug45019.phpt
andrey Fri Jul 25 12:46:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/mysqli/tests bug45019.phpt
Log:
MFH: Fixed bug#45019 Segmentation fault with SELECT ? and UNION
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.18&r2=1.118.2.22.2.16.2.19&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.18
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.19
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.18Thu Jul 17
09:53:41 2008
+++ php-src/ext/mysqli/mysqli_api.c Fri Jul 25 12:46:03 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.18 2008/07/17 09:53:41 dmitry Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.19 2008/07/25 12:46:03 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -389,8 +389,13 @@
if (stmt->stmt->fields[ofs].max_length == 0 &&
!mysql_stmt_attr_get(stmt->stmt,
STMT_ATTR_UPDATE_MAX_LENGTH, &tmp) && !tmp)
{
- stmt->result.buf[ofs].buflen =
- (stmt->stmt->fields) ?
(stmt->stmt->fields[ofs].length) ? stmt->stmt->fields[ofs].length + 1: 256: 256;
+ /*
+ Allocate directly 256 because it's
easier to allocate a bit more
+ than update max length even for text
columns. Try SELECT UNION SELECT UNION with
+ different lengths and you will see
that we get different lengths in stmt->stmt->fields[ofs].length
+ The just take 256 and saves us from
realloc-ing.
+ */
+ stmt->result.buf[ofs].buflen = 256;
} else {
/*
the user has called
store_result(). if he does not there is no way to determine the
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug45019.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/mysqli/tests/bug45019.phpt
diff -u php-src/ext/mysqli/tests/bug45019.phpt:1.1.2.2
php-src/ext/mysqli/tests/bug45019.phpt:1.1.2.3
--- php-src/ext/mysqli/tests/bug45019.phpt:1.1.2.2 Thu Jul 24 14:17:47 2008
+++ php-src/ext/mysqli/tests/bug45019.phpt Fri Jul 25 12:46:03 2008
@@ -57,7 +57,7 @@
printf("[006] [%d] %s\n", $link->errno, $link->error);
$column1 = null;
- if (!$stmt->bind_result($column1) || !$stmt->execute())
+ if (!$stmt->execute() || !$stmt->bind_result($column1))
printf("[007] [%d] %s\n", $stmt->errno, $stmt->error);
$index = 0;
@@ -153,6 +153,6 @@
string(3) "two"
Testing bind_param(), strings only, with CAST AS CHAR...
string(3) "one"
-string(5) "three beers are more than enough"
+string(32) "three beers are more than enough"
string(3) "two"
-done!
\ No newline at end of file
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c /ext/mysqli/tests mysqli_stmt_datatype_change.phpt /ext/mysqlnd mysqlnd.c mysqlnd_ps.c mysqlnd_ps_codec.c
andrey Thu Mar 20 14:03:30 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests mysqli_stmt_datatype_change.phpt
Modified files:
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/mysqlndmysqlnd.c mysqlnd_ps.c mysqlnd_ps_codec.c
Log:
- Don't modify the variables which are passed for parameter binding.
We need to clone them, if there will be a transformation (convert_to_xxx)
which will change the origin
(bug#44390 bind_param / bind_result and Object member variables)
- Make mysqlnd more compatible to libmysql, in this case if the execute of
a statement fails set the state of the statement back to PREPARED
- A test case to check the case of a failing statement.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.14&r2=1.118.2.22.2.16.2.15&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.14
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.15
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.14Mon Mar 10
20:15:38 2008
+++ php-src/ext/mysqli/mysqli_api.c Thu Mar 20 14:03:29 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.14 2008/03/10 20:15:38 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.15 2008/03/20 14:03:29 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -689,6 +689,22 @@
}
/* }}} */
+#ifndef MYSQLI_USE_MYSQLND
+/* {{{ php_mysqli_stmt_copy_it */
+static void
+php_mysqli_stmt_copy_it(zval *** copies, zval *original, uint param_count,
uint current)
+{
+ if (!*copies) {
+ *copies = ecalloc(param_count, sizeof(zval *));
+ }
+ MAKE_STD_ZVAL((*copies)[current]);
+ *(*copies)[current] = *original;
+ Z_SET_REFCOUNT_P((*copies)[current], 1);
+ zval_copy_ctor((*copies)[current]);
+}
+/* }}} */
+#endif
+
/* {{{ proto bool mysqli_stmt_execute(object stmt)
Execute a prepared statement */
PHP_FUNCTION(mysqli_stmt_execute)
@@ -697,6 +713,7 @@
zval*mysql_stmt;
#ifndef MYSQLI_USE_MYSQLND
unsigned inti;
+ zval**copies = NULL;
#endif
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
@@ -705,23 +722,48 @@
MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt",
MYSQLI_STATUS_VALID);
#ifndef MYSQLI_USE_MYSQLND
+ if (stmt->param.var_cnt) {
+ int j;
+ for (i = 0; i < stmt->param.var_cnt; i++) {
+ for (j = i + 1; j < stmt->param.var_cnt; j++) {
+ /* Oops, someone binding the same variable -
clone */
+ if (stmt->param.vars[j] == stmt->param.vars[i])
{
+ php_mysqli_stmt_copy_it(&copies,
stmt->param.vars[i], stmt->param.var_cnt, i);
+ break;
+ }
+ }
+ }
+ }
for (i = 0; i < stmt->param.var_cnt; i++) {
if (stmt->param.vars[i]) {
if ( !(stmt->param.is_null[i] =
(stmt->param.vars[i]->type == IS_NULL)) ) {
+ zval *the_var = copies && copies[i]?
copies[i]:stmt->param.vars[i];
switch (stmt->stmt->params[i].buffer_type) {
case MYSQL_TYPE_VAR_STRING:
-
convert_to_string_ex(&stmt->param.vars[i]);
- stmt->stmt->params[i].buffer =
Z_STRVAL_PP(&stmt->param.vars[i]);
-
stmt->stmt->params[i].buffer_length = Z_STRLEN_PP(&stmt->param.vars[i]);
+ if (the_var ==
stmt->param.vars[i] && Z_TYPE_P(stmt->param.vars[i]) != IS_STRING) {
+
php_mysqli_stmt_copy_it(&copies, stmt->param.vars[i], stmt->param.var_cnt, i);
+ the_var = copies[i];
+ }
+ convert_to_string_ex(&the_var);
+ stmt->stmt->params[i].buffer =
Z_STRVAL_P(the_var);
+
stmt->stmt->params[i].buffer_length = Z_STRLEN_P(the_var);
break;
case MYSQL_TYPE_DOUBLE:
-
convert_to_double_ex(&stmt->param.vars[i]);
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
hholzgraTue Jan 1 18:13:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c
Log:
fixed binary arithmetic (MF5.2)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.10&r2=1.118.2.22.2.16.2.11&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.10
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.11
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.10Mon Dec 31
07:17:10 2007
+++ php-src/ext/mysqli/mysqli_api.c Tue Jan 1 18:13:14 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.10 2007/12/31 07:17:10 sebastian Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.11 2008/01/01 18:13:14 hholzgra Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1626,7 +1626,7 @@
/* remove some insecure options */
flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via
connect parameter */
if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
- flags ^= CLIENT_LOCAL_FILES;
+ flags &= ~CLIENT_LOCAL_FILES;
}
#if !defined(HAVE_MYSQLND)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
hholzgraTue Dec 25 18:55:40 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c
Log:
MFH: Fix for bug #42548 "PROCEDURE xxx can't return a result set"
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.8&r2=1.118.2.22.2.16.2.9&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.8
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.9
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.8 Fri Nov 9 10:56:28 2007
+++ php-src/ext/mysqli/mysqli_api.c Tue Dec 25 18:55:40 2007
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.8 2007/11/09 10:56:28 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.9 2007/12/25 18:55:40 hholzgra Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1621,6 +1621,8 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
+ /* set some required options */
+ flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */
/* remove some insecure options */
flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via
connect parameter */
if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
janiMon Oct 29 09:51:08 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli_api.c Log: MFH:- Fixed invalid handling of float value passed to an integer field on 64bit machine http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.6&r2=1.118.2.22.2.16.2.7&diff_format=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.6 php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.7 --- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.6 Wed Oct 17 08:19:07 2007 +++ php-src/ext/mysqli/mysqli_api.c Mon Oct 29 09:51:08 2007 @@ -17,7 +17,7 @@ | Ulf Wendel <[EMAIL PROTECTED]> | +--+ - $Id: mysqli_api.c,v 1.118.2.22.2.16.2.6 2007/10/17 08:19:07 tony2001 Exp $ + $Id: mysqli_api.c,v 1.118.2.22.2.16.2.7 2007/10/29 09:51:08 jani Exp $ */ #ifdef HAVE_CONFIG_H @@ -105,7 +105,11 @@ break; case 'i': /* Integer */ - bind[ofs].buffer_type = (sizeof(long) > 4) ? MYSQL_TYPE_LONGLONG : MYSQL_TYPE_LONG; +#if SIZEOF_LONG==8 + bind[ofs].buffer_type = MYSQL_TYPE_LONGLONG; +#elif SIZEOF_LONG==4 + bind[ofs].buffer_type = MYSQL_TYPE_LONG; +#endif bind[ofs].buffer = &Z_LVAL_PP(args[i]); bind[ofs].is_null = &stmt->param.is_null[ofs]; break; @@ -719,6 +723,7 @@ convert_to_double_ex(&stmt->param.vars[i]); stmt->stmt->params[i].buffer = &Z_LVAL_PP(&stmt->param.vars[i]); break; + case MYSQL_TYPE_LONGLONG: case MYSQL_TYPE_LONG: convert_to_long_ex(&stmt->param.vars[i]); stmt->stmt->params[i].buffer = &Z_LVAL_PP(&stmt->param.vars[i]); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
tony2001Wed Oct 17 08:19:07 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c
Log:
..and correct macro
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.5&r2=1.118.2.22.2.16.2.6&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.5
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.6
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.5 Wed Oct 17 08:18:09 2007
+++ php-src/ext/mysqli/mysqli_api.c Wed Oct 17 08:19:07 2007
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.5 2007/10/17 08:18:09 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.6 2007/10/17 08:19:07 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1371,7 +1371,7 @@
} else {
zval_dtor(mysql->li_read);
}
- ZVAL_STRINGL(mysql->li_read, callback_name, 0);
+ ZVAL_STRING(mysql->li_read, callback_name, 0);
RETURN_TRUE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
tony2001Sun Oct 7 08:30:47 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.2&r2=1.118.2.22.2.16.2.3&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.2
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.3
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.2 Sun Oct 7 05:22:05 2007
+++ php-src/ext/mysqli/mysqli_api.c Sun Oct 7 08:30:47 2007
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.2 2007/10/07 05:22:05 davidw Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.3 2007/10/07 08:30:47 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -138,7 +138,7 @@
stmt->param.vars = (zval **)safe_emalloc(num_vars,
sizeof(zval), 0);
for (i = 0; i < num_vars; i++) {
if (bind[i].buffer_type != MYSQL_TYPE_LONG_BLOB) {
- Z_ADDREF_PP(*args[i+start]);
+ Z_ADDREF_P(*args[i+start]);
stmt->param.vars[i] = *args[i+start];
} else {
stmt->param.vars[i] = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
