[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysqli mysqli_api.c mysqli_prop.c /ext/pdo_mysql mysql_statement.c
kalle Wed May 20 08:30:12 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_api.c mysqli_prop.c
/php-src/ext/pdo_mysql mysql_statement.c
Log:
MFH: Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.36r2=1.213.2.6.2.16.2.37diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.36
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.37
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.36 Wed Mar 25 10:27:38 2009
+++ php-src/ext/mysql/php_mysql.c Wed May 20 08:30:12 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.36 2009/03/25 10:27:38 johannes Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.37 2009/05/20 08:30:12 kalle Exp $ */
/* TODO:
*
@@ -1166,7 +1166,7 @@
}
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
MySQL-Link, le_link, le_plink);
- RETURN_LONG(mysql_thread_id(mysql-conn));
+ RETURN_LONG((long) mysql_thread_id(mysql-conn));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.24r2=1.118.2.22.2.16.2.25diff_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.24
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.24Thu Jan 22
21:01:56 2009
+++ php-src/ext/mysqli/mysqli_api.c Wed May 20 08:30:12 2009
@@ -17,7 +17,7 @@
| Ulf Wendel u...@php.net |
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.24 2009/01/22 21:01:56 johannes Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.25 2009/05/20 08:30:12 kalle Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -158,7 +158,7 @@
int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned
int num_vars,
zval
***args, unsigned int start, const char * const types TSRMLS_DC)
{
- int i;
+ unsigned int i;
MYSQLND_PARAM_BIND *params;
enum_func_statusret = FAIL;
@@ -1074,7 +1074,7 @@
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result,
mysqli_result, MYSQLI_STATUS_VALID);
- if (offset 0 || offset = mysql_num_fields(result)) {
+ if (offset 0 || offset = (long) mysql_num_fields(result)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Field offset is
invalid for resultset);
RETURN_FALSE;
}
@@ -2081,7 +2081,7 @@
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link,
MYSQLI_STATUS_INITIALIZED);
- RETURN_BOOL(!mysql_refresh(mysql-mysql, options));
+ RETURN_BOOL(!mysql_refresh(mysql-mysql, (uint8_t) options));
}
/* }}} */
@@ -2354,7 +2354,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link,
MYSQLI_STATUS_VALID);
- RETURN_LONG(mysql_thread_id(mysql-mysql));
+ RETURN_LONG((long) mysql_thread_id(mysql-mysql));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.23.2.5.2.2.2.11r2=1.23.2.5.2.2.2.12diff_format=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.11
php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.12
--- php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.11 Mon Jan 12 12:56:01 2009
+++ php-src/ext/mysqli/mysqli_prop.cWed May 20 08:30:12 2009
@@ -15,7 +15,7 @@
| Author: Georg Richter ge...@php.net|
+--+
- $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.11 2009/01/12 12:56:01 johannes Exp $
+ $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.12 2009/05/20 08:30:12 kalle Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -83,7 +83,7 @@
} else {\
l = (__ret_type)__int_func(p);\
if (l LONG_MAX) {\
- ZVAL_LONG(*retval, l);\
+ ZVAL_LONG(*retval, (long) l);\
} else { \
char *ret; \
int ret_len = spprintf(ret, 0, __ret_type_sprint_mod,
l); \
@@ -156,7 +156,7 @@
static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MY_MYSQL *mysql;
- my_ulonglong rc;
+ long rc;
MAKE_STD_ZVAL(*retval);
@@ -169,9 +169,9 @@
} else {
CHECK_STATUS(MYSQLI_STATUS_VALID);
- rc = mysql_affected_rows(mysql-mysql);
+ rc = (long) mysql_affected_rows(mysql-mysql);
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysql/tests mysql_db_query.phpt
johannesWed Mar 25 10:27:38 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysql/testsmysql_db_query.phpt
Log:
MFH: mysql_db_query() is always deprecated
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.35r2=1.213.2.6.2.16.2.36diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.35
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.36
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.35 Wed Feb 18 16:34:47 2009
+++ php-src/ext/mysql/php_mysql.c Wed Mar 25 10:27:38 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.35 2009/02/18 16:34:47 johannes Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.36 2009/03/25 10:27:38 johannes Exp $ */
/* TODO:
*
@@ -1472,9 +1472,7 @@
CHECK_LINK(id);
}
- if (MySG(trace_mode) || !strcasecmp(get_active_function_name(TSRMLS_C),
mysql)) {
- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, This function
is deprecated; use mysql_query() instead.);
- }
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, This function is
deprecated; use mysql_query() instead);
php_mysql_do_query_general(query, query_len, mysql_link, id, db,
MYSQL_STORE_RESULT, return_value TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_query.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_query.phpt
diff -u php-src/ext/mysql/tests/mysql_db_query.phpt:1.2.2.3
php-src/ext/mysql/tests/mysql_db_query.phpt:1.2.2.4
--- php-src/ext/mysql/tests/mysql_db_query.phpt:1.2.2.3 Fri Oct 12 11:57:18 2007
+++ php-src/ext/mysql/tests/mysql_db_query.phpt Wed Mar 25 10:27:38 2009
@@ -25,7 +25,7 @@
printf([003] Expecting NULL/NULL, got %s/%s\n, gettype($tmp), $tmp);
require('table.inc');
-if (!$res = mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1', $link))
+if (!$res = @mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1', $link))
printf([004] [%d] %s\n, mysql_errno($link), mysql_error($link));
$row = mysql_fetch_assoc($res);
@@ -40,7 +40,7 @@
mysql_free_result($res);
-if (!$res = mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1'))
+if (!$res = @mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1'))
printf([007] [%d] %s\n, mysql_errno(), mysql_error());
$row = mysql_fetch_assoc($res);
@@ -58,4 +58,4 @@
print done!\n;
?
--EXPECTF--
-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/mysql php_mysql.c /ext/mysql/tests mysql_fetch_array.phpt mysql_fetch_assoc.phpt mysql_fetch_row.phpt
johannesMon Dec 1 21:20:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysql/testsmysql_fetch_array.phpt
mysql_fetch_assoc.phpt
mysql_fetch_row.phpt
Log:
MFH: Fix mysql_fetch_* and tests after param parsing changes
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.32r2=1.213.2.6.2.16.2.33diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.32
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.33
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.32 Fri Nov 28 20:23:49 2008
+++ php-src/ext/mysql/php_mysql.c Mon Dec 1 21:20:47 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.32 2008/11/28 20:23:49 johannes Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.33 2008/12/01 21:20:47 johannes Exp $ */
/* TODO:
*
@@ -1963,8 +1963,6 @@
} else
#endif
{
- result_type = MYSQL_BOTH;
-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l,
res, result_type) == FAILURE) {
return;
}
@@ -2109,7 +2107,7 @@
MYSQL_RES *result;
zval*mysql_result;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z,
mysql_result) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r,
mysql_result) == FAILURE) {
return;
}
ZEND_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, -1, MySQL
result, le_result);
@@ -2146,7 +2144,7 @@
zval*mysql_result;
longmode = MYSQLND_FETCH_BOTH;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z|l,
mysql_result, mode) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l,
mysql_result, mode) == FAILURE) {
return;
}
ZEND_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, -1, MySQL
result, le_result);
@@ -2167,7 +2165,7 @@
MYSQL_RES *result;
zval*mysql_result;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z,
mysql_result) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r,
mysql_result) == FAILURE) {
return;
}
ZEND_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, -1, MySQL
result, le_result);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_array.phpt?r1=1.3.2.3r2=1.3.2.4diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_array.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.3.2.3
php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.3.2.4
--- php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.3.2.3 Thu Apr 24
14:22:19 2008
+++ php-src/ext/mysql/tests/mysql_fetch_array.phpt Mon Dec 1 21:20:47 2008
@@ -15,8 +15,8 @@
if (NULL !== ($tmp = @mysql_fetch_array()))
printf([001] Expecting NULL, got %s/%s\n, gettype($tmp), $tmp);
-if (false !== ($tmp = @mysql_fetch_array($link)))
- printf([002] Expecting boolean/false, got %s/%s\n, gettype($tmp),
$tmp);
+if (NULL != ($tmp = @mysql_fetch_array($link)))
+ printf([002] Expecting NULL, got %s/%s\n, gettype($tmp), $tmp);
require('table.inc');
if (!$res = mysql_query(SELECT * FROM test ORDER BY id LIMIT 5, $link)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_assoc.phpt?r1=1.3.2.2r2=1.3.2.3diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_assoc.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.3.2.2
php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.3.2.3
--- php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.3.2.2 Wed Oct 10
09:51:45 2007
+++ php-src/ext/mysql/tests/mysql_fetch_assoc.phpt Mon Dec 1 21:20:47 2008
@@ -17,8 +17,8 @@
if (!is_null($tmp = @mysql_fetch_assoc()))
printf([001] Expecting NULL, got %s/%s\n, gettype($tmp), $tmp);
-if (false !== ($tmp = @mysql_fetch_assoc($link)))
- printf([002] Expecting boolean/false, got %s/%s\n, gettype($tmp),
$tmp);
+if (NULL !== ($tmp = @mysql_fetch_assoc($link)))
+ printf([002] Expecting NULL, got %s/%s\n, gettype($tmp), $tmp);
require('table.inc');
if (!$res = mysql_query(SELECT id, label FROM test ORDER BY id LIMIT 1,
$link)) {
@@ -135,4 +135,4 @@
[u_foo]=
NULL
}
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_row.phpt?r1=1.3.2.3r2=1.3.2.4diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_row.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.3.2.3
php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.3.2.4
--- php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.3.2.3Mon Mar 17
17:19:48 2008
+++
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysqli mysqli_nonapi.c
andrey Mon Oct 27 12:09:37 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_nonapi.c
Log:
MFH:
Warning if the library API version differs from the headers used to compile.
Patch versions are not considered but major.minor
Fix build of ext/mysql with 4.0.x and pre.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.28r2=1.213.2.6.2.16.2.29diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.28
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.29
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.28 Tue Oct 21 22:07:42 2008
+++ php-src/ext/mysql/php_mysql.c Mon Oct 27 12:09:36 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.28 2008/10/21 22:07:42 lbarnaud Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.29 2008/10/27 12:09:36 andrey Exp $ */
/* TODO:
*
@@ -130,10 +130,14 @@
static MYSQLND_QCACHE *mysql_mysqlnd_qcache;
#endif
+#if MYSQL_VERSION_ID = 40101
#define MYSQL_DISABLE_MQ if (mysql-multi_query) { \
mysql_set_server_option(mysql-conn,
MYSQL_OPTION_MULTI_STATEMENTS_OFF); \
mysql-multi_query = 0; \
}
+#else
+#define MYSQL_DISABLE_MQ
+#endif
/* {{{ mysql_functions[]
*/
@@ -632,6 +636,13 @@
zend_bool free_host=0, new_link=0;
long connect_timeout;
+#if !defined(MYSQL_USE_MYSQLND)
+ if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ Headers and client library
minor version mismatch. Headers:%d Library:%d,
+ MYSQL_VERSION_ID,
mysql_get_client_version());
+ }
+#endif
connect_timeout = MySG(connect_timeout);
@@ -693,8 +704,9 @@
client_flags ^= CLIENT_LOCAL_FILES;
}
+#ifdef CLIENT_MULTI_STATEMENTS
client_flags = ~CLIENT_MULTI_STATEMENTS; /* don't allow
multi_queries via connect parameter */
-
+#endif
hashed_details_length = spprintf(hashed_details, 0,
mysql_%s_%s_%s_%ld, SAFE_STRING(host_and_port), SAFE_STRING(user),
SAFE_STRING(passwd), client_flags);
}
@@ -746,7 +758,12 @@
/* create the link */
mysql = (php_mysql_conn *)
malloc(sizeof(php_mysql_conn));
mysql-active_result_id = 0;
+#ifdef CLIENT_MULTI_STATEMENTS
mysql-multi_query = client_flags
CLIENT_MULTI_STATEMENTS? 1:0;
+#else
+ mysql-multi_query = 0;
+#endif
+
#ifndef MYSQL_USE_MYSQLND
mysql-conn = mysql_init(NULL);
#else
@@ -794,7 +811,11 @@
}
mysql = (php_mysql_conn *) le-ptr;
mysql-active_result_id = 0;
+#ifdef CLIENT_MULTI_STATEMENTS
mysql-multi_query = client_flags
CLIENT_MULTI_STATEMENTS? 1:0;
+#else
+ mysql-multi_query = 0;
+#endif
/* ensure that the link did not die */
#if defined(MYSQL_USE_MYSQLND)
mysqlnd_end_psession(mysql-conn);
@@ -860,7 +881,10 @@
mysql = (php_mysql_conn *) emalloc(sizeof(php_mysql_conn));
mysql-active_result_id = 0;
+#ifdef CLIENT_MULTI_STATEMENTS
mysql-multi_query = 1;
+#endif
+
#ifndef MYSQL_USE_MYSQLND
mysql-conn = mysql_init(NULL);
#else
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.15r2=1.54.2.7.2.5.2.16diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.15
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.16
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.15Mon Aug 11
12:33:55 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Oct 27 12:09:36 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.15 2008/08/11 12:33:55 johannes Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.16 2008/10/27 12:09:36 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -66,6 +66,15 @@
zend_rsrc_list_entry*le;
mysqli_plist_entry *plist = NULL;
+
+#if !defined(MYSQL_USE_MYSQLND)
+ if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ Headers and client library
minor version mismatch. Headers:%d Library:%d,
+ MYSQL_VERSION_ID,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c
iliaa Mon Oct 27 23:27:21 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
Fixed compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.29r2=1.213.2.6.2.16.2.30diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.29
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.30
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.29 Mon Oct 27 12:09:36 2008
+++ php-src/ext/mysql/php_mysql.c Mon Oct 27 23:27:21 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.29 2008/10/27 12:09:36 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.30 2008/10/27 23:27:21 iliaa Exp $ */
/* TODO:
*
@@ -639,7 +639,7 @@
#if !defined(MYSQL_USE_MYSQLND)
if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
- Headers and client library
minor version mismatch. Headers:%d Library:%d,
+ Headers and client library
minor version mismatch. Headers:%d Library:%ld,
MYSQL_VERSION_ID,
mysql_get_client_version());
}
#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/mysql php_mysql.c php_mysql_structs.h
andrey Wed Aug 6 19:25:04 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c php_mysql_structs.h
Log:
Re-add mysql_set_charset. Missed during introduction of mysqlnd. Exists in
HEAD, thus no merge
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.25r2=1.213.2.6.2.16.2.26diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.25
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.26
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.25 Fri Jul 25 08:23:06 2008
+++ php-src/ext/mysql/php_mysql.c Wed Aug 6 19:25:03 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.25 2008/07/25 08:23:06 dmitry Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.26 2008/08/06 19:25:03 andrey Exp $ */
/* TODO:
*
@@ -192,7 +192,9 @@
#endif
PHP_FE(mysql_info,
NULL)
-
+#ifdef MYSQL_HAS_SET_CHARSET
+ PHP_FE(mysql_set_charset,
NULL)
+#endif
/* for downwards compatability */
PHP_FALIAS(mysql, mysql_db_query,
NULL)
PHP_FALIAS(mysql_fieldname, mysql_field_name, NULL)
@@ -1242,6 +1244,36 @@
/* }}} */
#endif
+#ifdef MYSQL_HAS_SET_CHARSET
+/* {{{ proto bool mysql_set_charset(string csname [, int link_identifier])
+ sets client character set */
+PHP_FUNCTION(mysql_set_charset)
+{
+ zval *mysql_link = NULL;
+ char *csname;
+ int id = -1, csname_len;
+ php_mysql_conn *mysql;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|r, csname,
csname_len, mysql_link) == FAILURE) {
+ return;
+ }
+
+ if (ZEND_NUM_ARGS() == 1) {
+ id =
php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+ CHECK_LINK(id);
+ }
+
+ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
MySQL-Link, le_link, le_plink);
+
+ if (!mysql_set_character_set(mysql-conn, csname)) {
+ RETURN_TRUE;
+ } else {
+ RETURN_FALSE;
+ }
+}
+/* }}} */
+#endif
+
#ifndef NETWARE/* The below two functions not supported on
NetWare */
#if MYSQL_VERSION_ID 4
/* {{{ proto bool mysql_create_db(string database_name [, int link_identifier])
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql_structs.h?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/mysql/php_mysql_structs.h
diff -u php-src/ext/mysql/php_mysql_structs.h:1.1.2.5
php-src/ext/mysql/php_mysql_structs.h:1.1.2.6
--- php-src/ext/mysql/php_mysql_structs.h:1.1.2.5 Mon Jul 21 12:58:51 2008
+++ php-src/ext/mysql/php_mysql_structs.h Wed Aug 6 19:25:03 2008
@@ -18,7 +18,7 @@
*/
-/* $Id: php_mysql_structs.h,v 1.1.2.5 2008/07/21 12:58:51 andrey Exp $ */
+/* $Id: php_mysql_structs.h,v 1.1.2.6 2008/08/06 19:25:03 andrey Exp $ */
#ifndef PHP_MYSQL_STRUCTS_H
#define PHP_MYSQL_STRUCTS_H
@@ -49,7 +49,7 @@
#define MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR
#endif
-#if (MYSQL_VERSION_ID = 40113 MYSQL_VERSION_ID 5) ||
MYSQL_VERSION_ID = 50007 || MYSQL_USE_MYSQLND
+#if (MYSQL_VERSION_ID = 40113 MYSQL_VERSION_ID 5) ||
MYSQL_VERSION_ID = 50007 || defined(MYSQL_USE_MYSQLND)
#define MYSQL_HAS_SET_CHARSET
#endif
@@ -106,6 +106,9 @@
PHP_FUNCTION(mysql_thread_id);
PHP_FUNCTION(mysql_client_encoding);
PHP_FUNCTION(mysql_ping);
+#ifdef MYSQL_HAS_SET_CHARSET
+PHP_FUNCTION(mysql_set_charset);
+#endif
ZEND_BEGIN_MODULE_GLOBALS(mysql)
long default_link;
--
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/mysql php_mysql.c /ext/mysqli mysqli.c /ext/pdo pdo_dbh.c pdo_stmt.c /ext/pgsql pgsql.c /ext/reflection php_reflection.c /ext/spl spl_directory.c /ext/sqlite
dmitry Fri Jul 25 08:23:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2zend_execute_API.c
/php-src/main/streams userspace.c
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/splspl_directory.c
/php-src/ext/sqlite sqlite.c
Log:
Fixed uninitialised data
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.44r2=1.331.2.20.2.24.2.45diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.44
ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.45
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.44 Thu Jul 24 09:42:15 2008
+++ ZendEngine2/zend_execute_API.c Fri Jul 25 08:23:06 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.44 2008/07/24 09:42:15 dmitry
Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.45 2008/07/25 08:23:06 dmitry
Exp $ */
#include stdio.h
#include signal.h
@@ -1254,6 +1254,7 @@
fcall_cache.initialized = EG(autoload_func) ? 1 : 0;
fcall_cache.function_handler = EG(autoload_func);
fcall_cache.calling_scope = NULL;
+ fcall_cache.called_scope = NULL;
fcall_cache.object_pp = NULL;
exception = EG(exception);
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.31.2.3.2.7.2.3r2=1.31.2.3.2.7.2.4diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.31.2.3.2.7.2.3
php-src/main/streams/userspace.c:1.31.2.3.2.7.2.4
--- php-src/main/streams/userspace.c:1.31.2.3.2.7.2.3 Fri Jul 11 10:25:15 2008
+++ php-src/main/streams/userspace.cFri Jul 25 08:23:06 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.31.2.3.2.7.2.3 2008/07/11 10:25:15 tony2001 Exp $ */
+/* $Id: userspace.c,v 1.31.2.3.2.7.2.4 2008/07/25 08:23:06 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -262,6 +262,7 @@
fcc.initialized = 1;
fcc.function_handler = uwrap-ce-constructor;
fcc.calling_scope = EG(scope);
+ fcc.called_scope = Z_OBJCE_P(us-object);
fcc.object_pp = us-object;
if (zend_call_function(fci, fcc TSRMLS_CC) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.24r2=1.213.2.6.2.16.2.25diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.24
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.25
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.24 Tue Jul 22 23:44:23 2008
+++ php-src/ext/mysql/php_mysql.c Fri Jul 25 08:23:06 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.24 2008/07/22 23:44:23 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.25 2008/07/25 08:23:06 dmitry Exp $ */
/* TODO:
*
@@ -2176,6 +2176,7 @@
fcc.initialized = 1;
fcc.function_handler = ce-constructor;
fcc.calling_scope = EG(scope);
+ fcc.called_scope = Z_OBJCE_P(return_value);
fcc.object_pp = return_value;
if (zend_call_function(fci, fcc TSRMLS_CC) ==
FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.28r2=1.72.2.16.2.17.2.29diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.28
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.29
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.28 Mon Jul 21 12:58:51 2008
+++ php-src/ext/mysqli/mysqli.c Fri Jul 25 08:23:06 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.28 2008/07/21 12:58:51 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.29 2008/07/25 08:23:06 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1305,6 +1305,7 @@
fcc.initialized = 1;
fcc.function_handler = ce-constructor;
fcc.calling_scope = EG(scope);
+ fcc.called_scope = Z_OBJCE_P(return_value);
fcc.object_pp = return_value;
if (zend_call_function(fci, fcc TSRMLS_CC) ==
FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.10r2=1.82.2.31.2.17.2.11diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c
andrey Tue Jul 22 17:41:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
MFH: Fix a leak with pconn and mysqlnd
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.22r2=1.213.2.6.2.16.2.23diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.22
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.23
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.22 Mon Jul 21 12:58:51 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jul 22 17:41:15 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.22 2008/07/21 12:58:51 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.23 2008/07/22 17:41:15 andrey Exp $ */
/* TODO:
*
@@ -963,6 +963,14 @@
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
MySQL-Link, le_link, le_plink);
+#ifdef MYSQL_USE_MYSQLND
+ {
+ int tmp;
+ if ((mysql = zend_list_find(Z_RESVAL_PP(mysql_link), tmp))
tmp == le_plink) {
+ mysqlnd_end_psession(mysql-conn);
+ }
+ }
+#endif
if (id==-1) { /* explicit resource number */
PHPMY_UNBUFFERED_QUERY_CHECK();
zend_list_delete(Z_RESVAL_PP(mysql_link));
--
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/mysql php_mysql.c /ext/mysqli mysqli_nonapi.c
andrey Tue Jul 22 23:44:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_nonapi.c
Log:
MFH: Two less failing tests, one of which was definitely a leak in mysqli
with mysqlnd
and pconn. ext/mysql is being fixed with a better fix for similar leak.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.23r2=1.213.2.6.2.16.2.24diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.23
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.24
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.23 Tue Jul 22 17:41:15 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jul 22 23:44:23 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.23 2008/07/22 17:41:15 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.24 2008/07/22 23:44:23 andrey Exp $ */
/* TODO:
*
@@ -794,6 +794,9 @@
mysql-active_result_id = 0;
mysql-multi_query = client_flags
CLIENT_MULTI_STATEMENTS? 1:0;
/* ensure that the link did not die */
+#if defined(MYSQL_USE_MYSQLND)
+ mysqlnd_end_psession(mysql-conn);
+#endif
if (mysql_ping(mysql-conn)) {
if (mysql_errno(mysql-conn) == 2006) {
#ifndef MYSQL_USE_MYSQLND
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.13r2=1.54.2.7.2.5.2.14diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.13
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.14
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.13Tue Jun 24
11:01:38 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Jul 22 23:44:23 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.13 2008/06/24 11:01:38 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.14 2008/07/22 23:44:23 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -162,8 +162,12 @@
mysql-mysql =
zend_ptr_stack_pop(plist-free_links);
MyG(num_inactive_persistent)--;
+#if defined(MYSQLI_USE_MYSQLND)
+
mysqlnd_end_psession(mysql-mysql);
+#endif
/* reset variables */
/* todo: option for
ping or change_user */
+
#if G0
if
(!mysql_change_user(mysql-mysql, username, passwd, dbname)) {
#else
@@ -175,9 +179,6 @@
MyG(num_active_persistent)++;
goto end;
} else {
-#if defined(MYSQLI_USE_MYSQLND)
-
mysqlnd_end_psession(mysql-mysql);
-#endif
mysqli_close(mysql-mysql, MYSQLI_CLOSE_IMPLICIT);
mysql-mysql =
NULL;
}
--
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/mysql php_mysql.c /ext/mysqli mysqli.c /ext/mysqlnd mysqlnd.c mysqlnd_palloc.c mysqlnd_ps.c mysqlnd_wireprotocol.c
andrey Tue Jul 15 13:11:09 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqlndmysqlnd.c mysqlnd_palloc.c mysqlnd_ps.c
mysqlnd_wireprotocol.c
Log:
Sync with bzr
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.20r2=1.213.2.6.2.16.2.21diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.20
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.21
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.20 Tue Jun 24 22:22:48 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jul 15 13:11:08 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.20 2008/06/24 22:22:48 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.21 2008/07/15 13:11:08 andrey Exp $ */
/* TODO:
*
@@ -687,6 +687,8 @@
client_flags ^= CLIENT_LOCAL_FILES;
}
+ client_flags = ~CLIENT_MULTI_STATEMENTS; /* don't allow
multi_queries via connect parameter */
+
hashed_details_length = spprintf(hashed_details, 0,
mysql_%s_%s_%s_%ld, SAFE_STRING(host_and_port), SAFE_STRING(user),
SAFE_STRING(passwd), client_flags);
}
@@ -738,7 +740,7 @@
/* create the link */
mysql = (php_mysql_conn *)
malloc(sizeof(php_mysql_conn));
mysql-active_result_id = 0;
- mysql-multi_query = 1;
+ mysql-multi_query = client_flags
CLIENT_MULTI_STATEMENTS? 1:0;
#ifndef MYSQL_USE_MYSQLND
mysql-conn = mysql_init(NULL);
#else
@@ -786,7 +788,7 @@
}
mysql = (php_mysql_conn *) le-ptr;
mysql-active_result_id = 0;
- mysql-multi_query = 1;
+ mysql-multi_query = client_flags
CLIENT_MULTI_STATEMENTS? 1:0;
/* ensure that the link did not die */
if (mysql_ping(mysql-conn)) {
if (mysql_errno(mysql-conn) == 2006) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.26r2=1.72.2.16.2.17.2.27diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.26
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.27
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.26 Tue Jun 24 22:22:48 2008
+++ php-src/ext/mysqli/mysqli.c Tue Jul 15 13:11:09 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.26 2008/06/24 22:22:48 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.27 2008/07/15 13:11:09 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -893,6 +893,12 @@
#endif
#endif
+ REGISTER_LONG_CONSTANT(MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED,
SERVER_QUERY_NO_GOOD_INDEX_USED, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(MYSQLI_SERVER_QUERY_NO_INDEX_USED,
SERVER_QUERY_NO_INDEX_USED, CONST_CS | CONST_PERSISTENT);
+#ifdef SERVER_QUERY_WAS_SLOW
+ REGISTER_LONG_CONSTANT(MYSQLI_SERVER_QUERY_WAS_SLOW,
SERVER_QUERY_WAS_SLOW, CONST_CS | CONST_PERSISTENT);
+#endif
+
return SUCCESS;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.23r2=1.5.2.24diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.23
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.24
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.23 Tue Jun 24 22:22:48 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Jul 15 13:11:09 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd.c,v 1.5.2.23 2008/06/24 22:22:48 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.24 2008/07/15 13:11:09 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -467,7 +467,6 @@
DBG_ENTER(_mysqlnd_end_psession);
/* The thd zval cache is always freed on request shutdown, so this has
happened already */
mysqlnd_palloc_free_thd_cache_reference(conn-zval_cache);
- conn-zval_cache = NULL;
DBG_VOID_RETURN;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_palloc.c?r1=1.2.2.11r2=1.2.2.12diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_palloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.11
php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.12
--- php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.11 Tue Jun 24 22:22:48 2008
+++ php-src/ext/mysqlnd/mysqlnd_palloc.cTue Jul 15 13:11:09 2008
@@ -18,7 +18,7 @@
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysqli mysqli.c /ext/mysqlnd mysqlnd.c mysqlnd_palloc.c
andrey Tue Jun 24 13:19:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqlndmysqlnd.c mysqlnd_palloc.c
Log:
Fix double-free, introduced lately
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.18r2=1.213.2.6.2.16.2.19diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.18
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.19
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.18 Tue Jun 24 11:01:38 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jun 24 13:19:29 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.18 2008/06/24 11:01:38 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.19 2008/06/24 13:19:29 andrey Exp $ */
/* TODO:
*
@@ -365,6 +365,9 @@
void (*handler) (int);
handler = signal(SIGPIPE, SIG_IGN);
+#ifdef MYSQL_USE_MYSQLND
+ mysqlnd_end_psession(link-conn);
+#endif
mysql_close(link-conn);
signal(SIGPIPE, handler);
@@ -775,11 +778,12 @@
/* ensure that the link did not die */
if (mysql_ping(mysql-conn)) {
if (mysql_errno(mysql-conn) == 2006) {
-#ifndef MYSQL_USE_MYSQLND
- if (mysql_real_connect(mysql-conn,
host, user, passwd, NULL, port, socket, client_flags)==NULL)
-#else
+#ifdef MYSQL_USE_MYSQLND
+ mysqlnd_end_psession(mysql-conn);
if (mysqlnd_connect(mysql-conn, host,
user, passwd, 0, NULL, 0,
port, socket, client_flags, MySG(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL)
+#else
+ if (mysql_real_connect(mysql-conn,
host, user, passwd, NULL, port, socket, client_flags)==NULL)
#endif
{
php_error_docref(NULL
TSRMLS_CC, E_WARNING, Link to server lost, unable to reconnect);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.24r2=1.72.2.16.2.17.2.25diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.24
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.25
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.24 Tue May 6 17:05:14 2008
+++ php-src/ext/mysqli/mysqli.c Tue Jun 24 13:19:29 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.24 2008/05/06 17:05:14 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.25 2008/06/24 13:19:29 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -232,6 +232,9 @@
MY_MYSQL *mysql = (MY_MYSQL *)my_res-ptr;
if (mysql-mysql) {
if (!mysql-persistent) {
+#ifdef MYSQLI_USE_MYSQLND
+ mysqlnd_end_psession(mysql-mysql);
+#endif
mysqli_close(mysql-mysql,
MYSQLI_CLOSE_IMPLICIT);
} else {
zend_rsrc_list_entry *le;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.21r2=1.5.2.22diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.21
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.22
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.21 Tue Jun 24 11:01:38 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Jun 24 13:19:29 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd.c,v 1.5.2.21 2008/06/24 11:01:38 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.22 2008/06/24 13:19:29 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -451,7 +451,11 @@
mnd_pefree(conn-last_message, conn-persistent);
conn-last_message = NULL;
}
- conn-zval_cache = cache;
+ /*
+ The thd zval cache is always freed on request shutdown, so this has
happened already.
+ Don't touch the old value! Get new reference
+ */
+ conn-zval_cache = mysqlnd_palloc_get_thd_cache_reference(cache);
DBG_VOID_RETURN;
}
/* }}} */
@@ -461,16 +465,8 @@
PHPAPI void _mysqlnd_end_psession(MYSQLND *conn TSRMLS_DC)
{
DBG_ENTER(_mysqlnd_end_psession);
- /*
- BEWARE This will have a problem with a query cache.
- We need to move the data out of the zval cache before we end the
psession.
- Or we will use nirvana pointers!!
- */
- if (conn-zval_cache) {
- DBG_INF(Freeing zval cache
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysqli mysqli.c /ext/mysqlnd mysqlnd.c mysqlnd_palloc.c
andrey Tue Jun 24 22:22:49 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqlndmysqlnd.c mysqlnd_palloc.c
Log:
Fix remaining valgrind problems with pconn and zval cache
HEAD merge will follow tomorrow.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.19r2=1.213.2.6.2.16.2.20diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.19
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.20
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.19 Tue Jun 24 13:19:29 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jun 24 22:22:48 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.19 2008/06/24 13:19:29 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.20 2008/06/24 22:22:48 andrey Exp $ */
/* TODO:
*
@@ -365,9 +365,6 @@
void (*handler) (int);
handler = signal(SIGPIPE, SIG_IGN);
-#ifdef MYSQL_USE_MYSQLND
- mysqlnd_end_psession(link-conn);
-#endif
mysql_close(link-conn);
signal(SIGPIPE, handler);
@@ -520,6 +517,18 @@
}
/* }}} */
+
+#ifdef MYSQL_USE_MYSQLND
+static int php_mysql_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
+{
+ if (le-type == le_plink) {
+ mysqlnd_end_psession(((php_mysql_conn *) le-ptr)-conn);
+ }
+ return ZEND_HASH_APPLY_KEEP;
+} /* }}} */
+#endif
+
+
/* {{{ PHP_RSHUTDOWN_FUNCTION
*/
PHP_RSHUTDOWN_FUNCTION(mysql)
@@ -537,7 +546,9 @@
if (MySG(connect_error)!=NULL) {
efree(MySG(connect_error));
}
+
#ifdef MYSQL_USE_MYSQLND
+ zend_hash_apply(EG(persistent_list), (apply_func_t)
php_mysql_persistent_helper TSRMLS_CC);
mysqlnd_palloc_rshutdown(MySG(mysqlnd_thd_zval_cache));
#endif
@@ -734,8 +745,9 @@
mysql-conn = mysql_init(persistent);
#endif
- if (connect_timeout != -1)
+ if (connect_timeout != -1) {
mysql_options(mysql-conn,
MYSQL_OPT_CONNECT_TIMEOUT, (const char *)connect_timeout);
+ }
#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql-conn, host, user, passwd,
NULL, port, socket, client_flags)==NULL)
#else
@@ -778,12 +790,11 @@
/* ensure that the link did not die */
if (mysql_ping(mysql-conn)) {
if (mysql_errno(mysql-conn) == 2006) {
-#ifdef MYSQL_USE_MYSQLND
- mysqlnd_end_psession(mysql-conn);
+#ifndef MYSQL_USE_MYSQLND
+ if (mysql_real_connect(mysql-conn,
host, user, passwd, NULL, port, socket, client_flags)==NULL)
+#else
if (mysqlnd_connect(mysql-conn, host,
user, passwd, 0, NULL, 0,
port, socket, client_flags, MySG(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL)
-#else
- if (mysql_real_connect(mysql-conn,
host, user, passwd, NULL, port, socket, client_flags)==NULL)
#endif
{
php_error_docref(NULL
TSRMLS_CC, E_WARNING, Link to server lost, unable to reconnect);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.25r2=1.72.2.16.2.17.2.26diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.25
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.26
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.25 Tue Jun 24 13:19:29 2008
+++ php-src/ext/mysqli/mysqli.c Tue Jun 24 22:22:48 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.25 2008/06/24 13:19:29 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.26 2008/06/24 22:22:48 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -94,12 +94,8 @@
/* Destructor for mysqli entries in free_links/used_links */
void php_mysqli_dtor_p_elements(void *data)
{
- MYSQL *mysql = (MYSQL *) data;
-#if defined(MYSQLI_USE_MYSQLND)
TSRMLS_FETCH();
-
- mysqlnd_end_psession(mysql);
-#endif
+ MYSQL *mysql = (MYSQL *) data;
mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT);
}
@@ -232,9 +228,6 @@
MY_MYSQL *mysql = (MY_MYSQL *)my_res-ptr;
if (mysql-mysql) {
if (!mysql-persistent) {
-#ifdef MYSQLI_USE_MYSQLND
- mysqlnd_end_psession(mysql-mysql);
-#endif
mysqli_close(mysql-mysql,
MYSQLI_CLOSE_IMPLICIT);
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysqli mysqli_api.c /ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_debug.h mysqlnd_libmysql_compat.h mysqlnd_loaddata.c mysqlnd_ps.c mysqlnd_ps_
andrey Wed Apr 16 12:57:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/mysqlndmysqlnd.c mysqlnd.h mysqlnd_debug.h
mysqlnd_libmysql_compat.h mysqlnd_loaddata.c
mysqlnd_ps.c mysqlnd_ps_codec.c
mysqlnd_result.c mysqlnd_result_meta.c
mysqlnd_structs.h mysqlnd_wireprotocol.c
php_mysqlnd.c
Log:
MFB: Update CVS from the development tree
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.16r2=1.213.2.6.2.16.2.17diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.16
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.17
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.16 Mon Mar 10 22:15:36 2008
+++ php-src/ext/mysql/php_mysql.c Wed Apr 16 12:57:38 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.16 2008/03/10 22:15:36 felipe Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.17 2008/04/16 12:57:38 andrey Exp $ */
/* TODO:
*
@@ -1871,7 +1871,7 @@
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 @@
{
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 @@
{
zval **result, **field;
MYSQL_RES *mysql_result;
- MYSQL_FIELD *mysql_field = {0};
+ const MYSQL_FIELD *mysql_field = {0};
char buf[512];
int len;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.15r2=1.118.2.22.2.16.2.16diff_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.15
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.16
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.15Thu Mar 20
14:03:29 2008
+++ php-src/ext/mysqli/mysqli_api.c Wed Apr 16 12:57:38 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.15 2008/03/20 14:03:29 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.16 2008/04/16 12:57:38 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -166,7 +166,7 @@
if (argc == start) {
return PASS;
}
- params = emalloc((argc - start) * sizeof(MYSQLND_PARAM_BIND));
+ params = safe_emalloc(argc - start, sizeof(MYSQLND_PARAM_BIND), 0);
for (i = 0; i (argc - start); i++) {
zend_uchar type;
switch (types[i]) {
@@ -445,7 +445,7 @@
unsigned int i;
MYSQLND_RESULT_BIND *params;
- params = emalloc((argc - start) * sizeof(MYSQLND_RESULT_BIND));
+ params = safe_emalloc(argc - start, sizeof(MYSQLND_RESULT_BIND), 0);
for (i = 0; i (argc - start); i++) {
params[i].zv = *(args[i + start]);
}
@@ -984,7 +984,7 @@
/* }}} */
/* {{{ php_add_field_properties */
-static void php_add_field_properties(zval *value, MYSQL_FIELD *field TSRMLS_DC)
+static void php_add_field_properties(zval *value, const MYSQL_FIELD *field
TSRMLS_DC)
{
add_property_string(value, name,(field-name ? field-name : ), 1);
add_property_string(value, orgname,(field-org_name ? field-org_name
: ), 1);
@@ -1007,7 +1007,7 @@
{
MYSQL_RES *result;
zval*mysql_result;
- MYSQL_FIELD *field;
+ const MYSQL_FIELD *field;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
O, mysql_result, mysqli_result_class_entry) == FAILURE) {
return;
@@ -1030,7 +1030,6 @@
{
MYSQL_RES *result;
zval*mysql_result;
- MYSQL_FIELD *field;
zval*obj;
unsigned int i;
@@ -1044,7 +1043,7 @@
array_init(return_value);
for (i = 0; i mysql_num_fields(result); i++) {
- field = mysql_fetch_field_direct(result, i);
+ const MYSQL_FIELD *field = mysql_fetch_field_direct(result, i);
MAKE_STD_ZVAL(obj);
object_init(obj);
@@ -1061,7 +1060,7 @@
{
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysqli php_mysqli_structs.h
andrey Mon Mar 10 09:18:43 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli php_mysqli_structs.h Log: - Fix a warning in php_mysql.c - Fixed #44371 Extension compile failed http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.13r2=1.213.2.6.2.16.2.14diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.13 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.14 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.13 Sat Mar 8 15:00:50 2008 +++ php-src/ext/mysql/php_mysql.c Mon Mar 10 09:18:43 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.13 2008/03/08 15:00:50 andrey Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.14 2008/03/10 09:18:43 andrey Exp $ */ /* TODO: * @@ -673,7 +673,7 @@ client_flags ^= CLIENT_LOCAL_FILES; } - hashed_details_length = spprintf(hashed_details, 0, mysql_%s_%s_%s_%d, SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); + hashed_details_length = spprintf(hashed_details, 0, mysql_%s_%s_%s_%ld, SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); } /* We cannot use mysql_port anymore in windows, need to use http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli_structs.h?r1=1.4.2.10r2=1.4.2.11diff_format=u Index: php-src/ext/mysqli/php_mysqli_structs.h diff -u php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.10 php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.11 --- php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.10Sat Mar 8 14:55:52 2008 +++ php-src/ext/mysqli/php_mysqli_structs.h Mon Mar 10 09:18:43 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: php_mysqli_structs.h,v 1.4.2.10 2008/03/08 14:55:52 andrey Exp $ + $Id: php_mysqli_structs.h,v 1.4.2.11 2008/03/10 09:18:43 andrey Exp $ */ #ifndef PHP_MYSQLI_STRUCTS_H @@ -38,11 +38,11 @@ #ifdef HAVE_MYSQLND #include ext/mysqlnd/mysqlnd.h -#include ext/mysqli/mysqli_mysqlnd.h +#include mysqli_mysqlnd.h #else #include mysql.h #include errmsg.h -#include ext/mysqli/mysqli_libmysql.h +#include mysqli_libmysql.h #endif #include php_mysqli.h -- 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/mysql php_mysql.c
felipe Mon Mar 10 22:15:36 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
MFH: New way for check void parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.15r2=1.213.2.6.2.16.2.16diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.15
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.16
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.15 Mon Mar 10 20:15:38 2008
+++ php-src/ext/mysql/php_mysql.c Mon Mar 10 22:15:36 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.15 2008/03/10 20:15:38 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.16 2008/03/10 22:15:36 felipe Exp $ */
/* TODO:
*
@@ -1003,8 +1003,8 @@
Returns a string that represents the client library version */
PHP_FUNCTION(mysql_get_client_info)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING((char *)mysql_get_client_info(),1);
--
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/mysql php_mysql.c /ext/mysqli mysqli.c
andrey Sat Mar 8 15:00:50 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
Log:
Bug fixed in 5.0.46
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.12r2=1.213.2.6.2.16.2.13diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.12
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.13
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.12 Tue Mar 4 22:29:29 2008
+++ php-src/ext/mysql/php_mysql.c Sat Mar 8 15:00:50 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.12 2008/03/04 22:29:29 felipe Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.13 2008/03/08 15:00:50 andrey Exp $ */
/* TODO:
*
@@ -473,10 +473,10 @@
#ifdef PHP_WIN32
unsigned long client_ver = mysql_get_client_version();
/*
- Can't call mysql_server_end() multiple times prior to 5.0.42 on
Windows.
+ Can't call mysql_server_end() multiple times prior to 5.0.46 on
Windows.
PHP bug#41350 MySQL bug#25621
*/
- if ((client_ver = 50042 client_ver 50100) || client_ver 50122) {
+ if ((client_ver = 50046 client_ver 50100) || client_ver 50122) {
mysql_server_end();
}
#else
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.18r2=1.72.2.16.2.17.2.19diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.18
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.19
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.18 Sat Mar 8 14:55:52 2008
+++ php-src/ext/mysqli/mysqli.c Sat Mar 8 15:00:50 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.18 2008/03/08 14:55:52 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.19 2008/03/08 15:00:50 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -802,10 +802,10 @@
#ifdef PHP_WIN32
unsigned long client_ver = mysql_get_client_version();
/*
- Can't call mysql_server_end() multiple times prior to 5.0.42 on
Windows.
+ Can't call mysql_server_end() multiple times prior to 5.0.46 on
Windows.
PHP bug#41350 MySQL bug#25621
*/
- if ((client_ver = 50042 client_ver 50100) || client_ver 50122) {
+ if ((client_ver = 50046 client_ver 50100) || client_ver 50122) {
mysql_server_end();
}
#else
--
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/mysql php_mysql.c
felipe Tue Mar 4 22:29:29 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysql php_mysql.c Log: MFB: Fixed bug #44333 (SEGFAULT when using mysql_pconnect() with client_flags) http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.11r2=1.213.2.6.2.16.2.12diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.11 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.12 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.11 Sat Feb 23 17:06:21 2008 +++ php-src/ext/mysql/php_mysql.c Tue Mar 4 22:29:29 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.11 2008/02/23 17:06:21 helly Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.12 2008/03/04 22:29:29 felipe Exp $ */ /* TODO: * @@ -604,7 +604,7 @@ int user_len, passwd_len, host_len; char *hashed_details=NULL; int hashed_details_length, port = MYSQL_PORT; - int client_flags = 0; + long client_flags = 0; php_mysql_conn *mysql=NULL; #if MYSQL_VERSION_ID = 32230 void (*handler) (int); -- 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/mysql php_mysql.c
felipe Tue Feb 12 10:11:55 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
Fixed Bug #44094 (SEGFAULT when using mysql_connect())
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.8r2=1.213.2.6.2.16.2.9diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.8
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.9
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.8Sun Jan 20 14:10:44 2008
+++ php-src/ext/mysql/php_mysql.c Tue Feb 12 10:11:55 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.8 2008/01/20 14:10:44 bjori Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.9 2008/02/12 10:11:55 felipe Exp $ */
/* TODO:
*
@@ -643,7 +643,7 @@
hashed_details_length = spprintf(hashed_details, 0,
mysql__%s_, user);
client_flags = CLIENT_INTERACTIVE;
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
|s!s!s!ll, host_and_port, host_len,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
|s!s!s!bl, host_and_port, host_len,
user,
user_len, passwd, passwd_len,
new_link, client_flags)==FAILURE) {
return;
--
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/mysql php_mysql.c
johannesTue Feb 12 20:43:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
- MFH: Make clear what's going on and avoid overwriting parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.9r2=1.213.2.6.2.16.2.10diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.9
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.10
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.9Tue Feb 12 10:11:55 2008
+++ php-src/ext/mysql/php_mysql.c Tue Feb 12 20:43:42 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.9 2008/02/12 10:11:55 felipe Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.10 2008/02/12 20:43:42 johannes Exp $ */
/* TODO:
*
@@ -643,10 +643,19 @@
hashed_details_length = spprintf(hashed_details, 0,
mysql__%s_, user);
client_flags = CLIENT_INTERACTIVE;
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
|s!s!s!bl, host_and_port, host_len,
- user,
user_len, passwd, passwd_len,
-
new_link, client_flags)==FAILURE) {
- return;
+ /* mysql_pconnect does not support new_link parameter */
+ if (persistent) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
|s!s!s!l, host_and_port, host_len,
+ user,
user_len, passwd, passwd_len,
+
client_flags)==FAILURE) {
+ return;
+ }
+ } else {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
|s!s!s!bl, host_and_port, host_len,
+
user, user_len, passwd, passwd_len,
+
new_link, client_flags)==FAILURE) {
+ return;
+ }
}
if (!host_and_port) {
@@ -659,11 +668,6 @@
passwd = MySG(default_password);
}
- /* mysql_pconnect does not support new_link parameter */
- if (persistent) {
- client_flags= new_link;
- }
-
/* disable local infile option for open_basedir */
if (((PG(open_basedir) PG(open_basedir)[0] != '\0') ||
PG(safe_mode)) (client_flags CLIENT_LOCAL_FILES)) {
client_flags ^= CLIENT_LOCAL_FILES;
--
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/mysql php_mysql.c
iliaa Thu Dec 20 00:26:22 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
Fixed bug #43635 (mysql extension ingores INI settings on NULL values passed
to mysql_connect())
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.5r2=1.213.2.6.2.16.2.6diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.5
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.6
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.5Thu Nov 8 13:29:06 2007
+++ php-src/ext/mysql/php_mysql.c Thu Dec 20 00:26:21 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.5 2007/11/08 13:29:06 tony2001 Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.6 2007/12/20 00:26:21 iliaa Exp $ */
/* TODO:
*
@@ -643,16 +643,22 @@
hashed_details_length = spprintf(hashed_details, 0,
mysql__%s_, user);
client_flags = CLIENT_INTERACTIVE;
} else {
- host_and_port = MySG(default_host);
- user = MySG(default_user);
- passwd = MySG(default_password);
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |sssll,
host_and_port, host_len,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
|s!s!s!ll, host_and_port, host_len,
user,
user_len, passwd, passwd_len,
new_link, client_flags)==FAILURE) {
WRONG_PARAM_COUNT;
}
+ if (!host_and_port) {
+ host_and_port = MySG(default_host);
+ }
+ if (!user) {
+ user = MySG(default_user);
+ }
+ if (!passwd) {
+ passwd = MySG(default_password);
+ }
+
/* mysql_pconnect does not support new_link parameter */
if (persistent) {
client_flags= new_link;
--
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/mysql php_mysql.c
tony2001Thu Nov 8 13:29:06 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
MFH: plug leak on invalid result type
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.4r2=1.213.2.6.2.16.2.5diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.4
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.5
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.4Mon Oct 8 16:14:56 2007
+++ php-src/ext/mysql/php_mysql.c Thu Nov 8 13:29:06 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.4 2007/10/08 16:14:56 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.5 2007/11/08 13:29:06 tony2001 Exp $ */
/* TODO:
*
@@ -2031,6 +2031,7 @@
if ((result_type MYSQL_BOTH) == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, The result type
should be either MYSQL_NUM, MYSQL_ASSOC or MYSQL_BOTH);
+ result_type = MYSQL_BOTH;
}
ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, MySQL
result, le_result);
--
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/mysql php_mysql.c php_mysql.h php_mysql_structs.h
andrey Mon Oct 8 16:14:56 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/mysql php_mysql_structs.h Modified files: /php-src/ext/mysql php_mysql.c php_mysql.h Log: Move non-public code to non-public header file. This should also solve #42890 Constant LIST defined by mysqlclient and c-client http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.3r2=1.213.2.6.2.16.2.4diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.3 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.4 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.3Sun Oct 7 05:22:04 2007 +++ php-src/ext/mysql/php_mysql.c Mon Oct 8 16:14:56 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.3 2007/10/07 05:22:04 davidw Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.4 2007/10/08 16:14:56 andrey Exp $ */ /* TODO: * @@ -66,7 +66,7 @@ #endif #include php_ini.h -#include php_mysql.h +#include php_mysql_structs.h /* True globals, no need for thread safety */ static int le_result, le_link, le_plink; http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.h?r1=1.37.2.1.2.2.2.1r2=1.37.2.1.2.2.2.2diff_format=u Index: php-src/ext/mysql/php_mysql.h diff -u php-src/ext/mysql/php_mysql.h:1.37.2.1.2.2.2.1 php-src/ext/mysql/php_mysql.h:1.37.2.1.2.2.2.2 --- php-src/ext/mysql/php_mysql.h:1.37.2.1.2.2.2.1 Fri Oct 5 21:23:55 2007 +++ php-src/ext/mysql/php_mysql.h Mon Oct 8 16:14:56 2007 @@ -17,132 +17,18 @@ */ -/* $Id: php_mysql.h,v 1.37.2.1.2.2.2.1 2007/10/05 21:23:55 andrey Exp $ */ +/* $Id: php_mysql.h,v 1.37.2.1.2.2.2.2 2007/10/08 16:14:56 andrey Exp $ */ #ifndef PHP_MYSQL_H #define PHP_MYSQL_H -#ifdef PHP_WIN32 -#define PHP_MYSQL_API __declspec(dllexport) -#else -#define PHP_MYSQL_API -#endif - #if HAVE_MYSQL -#ifdef ZTS -#include TSRM.h -#endif - -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef FALSE -#define FALSE 0 -#endif - -#if defined(HAVE_MYSQLND) -#include ext/mysqlnd/mysqlnd.h -#include ext/mysql/mysql_mysqlnd.h -#else -#include mysql.h -#endif - -#if (MYSQL_VERSION_ID = 40113 MYSQL_VERSION_ID 5) || MYSQL_VERSION_ID = 50007 || HAVE_MYSQLND -#define MYSQL_HAS_SET_CHARSET -#endif - extern zend_module_entry mysql_module_entry; - #define mysql_module_ptr mysql_module_entry -PHP_MINIT_FUNCTION(mysql); -PHP_RINIT_FUNCTION(mysql); -PHP_MSHUTDOWN_FUNCTION(mysql); -PHP_RSHUTDOWN_FUNCTION(mysql); -PHP_MINFO_FUNCTION(mysql); - -PHP_FUNCTION(mysql_connect); -PHP_FUNCTION(mysql_pconnect); -PHP_FUNCTION(mysql_close); -PHP_FUNCTION(mysql_select_db); -#if MYSQL_VERSION_ID 4 -PHP_FUNCTION(mysql_create_db); -PHP_FUNCTION(mysql_drop_db); -#endif -PHP_FUNCTION(mysql_query); -PHP_FUNCTION(mysql_unbuffered_query); -PHP_FUNCTION(mysql_db_query); -PHP_FUNCTION(mysql_list_dbs); -PHP_FUNCTION(mysql_list_tables); -PHP_FUNCTION(mysql_list_fields); -PHP_FUNCTION(mysql_list_processes); -PHP_FUNCTION(mysql_error); -PHP_FUNCTION(mysql_errno); -PHP_FUNCTION(mysql_affected_rows); -PHP_FUNCTION(mysql_insert_id); -PHP_FUNCTION(mysql_result); -PHP_FUNCTION(mysql_num_rows); -PHP_FUNCTION(mysql_num_fields); -PHP_FUNCTION(mysql_fetch_row); -PHP_FUNCTION(mysql_fetch_array); -PHP_FUNCTION(mysql_fetch_assoc); -PHP_FUNCTION(mysql_fetch_object); -PHP_FUNCTION(mysql_data_seek); -PHP_FUNCTION(mysql_fetch_lengths); -PHP_FUNCTION(mysql_fetch_field); -PHP_FUNCTION(mysql_field_seek); -PHP_FUNCTION(mysql_free_result); -PHP_FUNCTION(mysql_field_name); -PHP_FUNCTION(mysql_field_table); -PHP_FUNCTION(mysql_field_len); -PHP_FUNCTION(mysql_field_type); -PHP_FUNCTION(mysql_field_flags); -PHP_FUNCTION(mysql_escape_string); -PHP_FUNCTION(mysql_real_escape_string); -PHP_FUNCTION(mysql_get_client_info); -PHP_FUNCTION(mysql_get_host_info); -PHP_FUNCTION(mysql_get_proto_info); -PHP_FUNCTION(mysql_get_server_info); -PHP_FUNCTION(mysql_info); -PHP_FUNCTION(mysql_stat); -PHP_FUNCTION(mysql_thread_id); -PHP_FUNCTION(mysql_client_encoding); -PHP_FUNCTION(mysql_ping); - -ZEND_BEGIN_MODULE_GLOBALS(mysql) - long default_link; - long num_links,num_persistent; - long max_links,max_persistent; - long allow_persistent; - long default_port; - char *default_host, *default_user, *default_password; - char *default_socket; - char *connect_error; - long connect_errno; - long connect_timeout; - long result_allocated; - long trace_mode; - long allow_local_infile; -#ifdef HAVE_MYSQLND - MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache; - MYSQLND_QCACHE *mysqlnd_qcache; - longcache_size; -#endif -ZEND_END_MODULE_GLOBALS(mysql) - -#ifdef ZTS -# define MySG(v) TSRMG(mysql_globals_id, zend_mysql_globals *, v) #else -# define MySG(v) (mysql_globals.v) -#endif - - -#else - #define
