[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c mysqli_api.c mysqli_fe.c php_mysqli_structs.h /ext/mysqli/tests mysqli_class_mysqli_interface.phpt mysqli_constants.phpt mysqli_poll.phpt /ext/my
johannesThu Jan 22 21:01:59 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlndmysqlnd_enum_n_def.h mysqlnd_libmysql_compat.h /php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_fe.c php_mysqli_structs.h /php-src/ext/mysqli/tests mysqli_class_mysqli_interface.phpt mysqli_constants.phpt mysqli_poll.phpt Log: MFH: export mysql_refresh [DOC] This makes mysql_refresh() as described in http://dev.mysql.com/doc/refman/6.0/en/mysql-refresh.html available as mysqli_Refresh() and mysqli-refresh() MYSQLI_REFRESH_BACKUP_LOG is only available when linking libmysql 6.0 or mysqlnd http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_enum_n_def.h?r1=1.2.2.12r2=1.2.2.13diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_enum_n_def.h diff -u php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.12 php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.13 --- php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.12 Wed Dec 31 11:15:39 2008 +++ php-src/ext/mysqlnd/mysqlnd_enum_n_def.hThu Jan 22 21:01:54 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.12 2008/12/31 11:15:39 sebastian Exp $ */ +/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.13 2009/01/22 21:01:54 johannes Exp $ */ #ifndef MYSQLND_ENUM_N_DEF_H #define MYSQLND_ENUM_N_DEF_H @@ -431,6 +431,15 @@ #define MYSQLND_DEFAULT_PREFETCH_ROWS (ulong) 1 +#define MYSQLND_REFRESH_GRANT 1 /* Refresh grant tables */ +#define MYSQLND_REFRESH_LOG2 /* Start on new log file */ +#define MYSQLND_REFRESH_TABLES 4 /* close all tables */ +#define MYSQLND_REFRESH_HOSTS 8/* Flush host cache */ +#define MYSQLND_REFRESH_STATUS 16 /* Flush status variables */ +#define MYSQLND_REFRESH_THREADS32 /* Flush thread cache */ +#define MYSQLND_REFRESH_SLAVE 64 /* Reset master info and restart slave */ +#define MYSQLND_REFRESH_MASTER 128 /* Remove all bin logs in the index */ +#define MYSQLND_REFRESH_BACKUP_LOG 0x20L #endif /* MYSQLND_ENUM_N_DEF_H */ http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h?r1=1.1.2.10r2=1.1.2.11diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h diff -u php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.1.2.10 php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.1.2.11 --- php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.1.2.10 Wed Dec 31 11:15:39 2008 +++ php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h Thu Jan 22 21:01:54 2009 @@ -73,6 +73,7 @@ #define mysql_ping(r) mysqlnd_ping((r)) #define mysql_real_escape_string(r,a,b,c) mysqlnd_real_escape_string((r), (a), (b), (c)) #define mysql_real_query(r,a,b)mysqlnd_query((r), (a), (b)) +#define mysql_refresh(conn, options) mysqlnd_refresh((conn), (options)) #define mysql_rollback(r) mysqlnd_rollback((r)) #define mysql_select_db(r,a) mysqlnd_select_db((r), (a) ,strlen((a))) #define mysql_set_server_option(r,o) mysqlnd_set_server_option((r), (o)) @@ -118,4 +119,14 @@ #define mysql_warning_count(r) mysqlnd_warning_count((r)) #define mysql_eof(r) (((r)-unbuf (r)-unbuf-eof_reached) || (r)-stored_data) +#define REFRESH_GRANT MYSQLND_REFRESH_GRANT +#define REFRESH_LOGMYSQLND_REFRESH_LOG +#define REFRESH_TABLES MYSQLND_REFRESH_TABLES +#define REFRESH_HOSTS MYSQLND_REFRESH_HOSTS +#define REFRESH_STATUS MYSQLND_REFRESH_STATUS +#define REFRESH_THREADSMYSQLND_REFRESH_THREADS +#define REFRESH_SLAVE MYSQLND_REFRESH_SLAVE +#define REFRESH_MASTER MYSQLND_REFRESH_MASTER +#define REFRESH_BACKUP_LOG MYSQLND_REFRESH_BACKUP_LOG + #endif /* MYSQLND_LIBMYSQL_COMPAT_H */ http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.37r2=1.72.2.16.2.17.2.38diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.37 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.38 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.37 Mon Jan 12 12:56:01 2009 +++ php-src/ext/mysqli/mysqli.c Thu Jan 22 21:01:55 2009 @@ -17,7 +17,7 @@ | Ulf Wendel u...@php.net | +--+ - $Id: mysqli.c,v 1.72.2.16.2.17.2.37 2009/01/12 12:56:01 johannes Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.38 2009/01/22 21:01:55 johannes Exp $ */ #ifdef HAVE_CONFIG_H @@ -862,6 +862,18 @@ REGISTER_LONG_CONSTANT(MYSQLI_SERVER_QUERY_WAS_SLOW, SERVER_QUERY_WAS_SLOW, CONST_CS | CONST_PERSISTENT); #endif + REGISTER_LONG_CONSTANT(MYSQLI_REFRESH_GRANT, REFRESH_GRANT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(MYSQLI_REFRESH_LOG,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c /ext/xmlwriter php_xmlwriter.c
iliaa Thu Dec 18 20:02:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src/ext/mysqli mysqli.c
Log:
Fixed bug #46887 (Invalid calls to php_error_docref())
# Patch by oeriksson at mandriva dot com and crrodriguez at opensuse dot org
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.15.2.9r2=1.20.2.12.2.15.2.10diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.9
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.10
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.9Mon Nov 17
11:28:00 2008
+++ php-src/ext/xmlwriter/php_xmlwriter.c Thu Dec 18 20:02:19 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.9 2008/11/17 11:28:00 felipe Exp $
*/
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.10 2008/12/18 20:02:19 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
@@ -168,7 +168,7 @@
#define XMLW_NAME_CHK(__err) \
if (xmlValidateName((xmlChar *) name, 0) != 0) {\
- php_error_docref(NULL TSRMLS_CC, E_WARNING, __err); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, __err);
\
RETURN_FALSE; \
} \
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.33r2=1.72.2.16.2.17.2.34diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.33
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.34
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.33 Thu Nov 27 19:01:22 2008
+++ php-src/ext/mysqli/mysqli.c Thu Dec 18 20:02:20 2008
@@ -17,7 +17,7 @@
| Ulf Wendel u...@php.net |
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.33 2008/11/27 19:01:22 dmitry Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.34 2008/12/18 20:02:20 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1352,7 +1352,7 @@
#define LOCAL_INFILE_ERROR_MSG(source,dest)\
memset(source, 0, LOCAL_INFILE_ERROR_LEN);\
memcpy(source, dest, MIN(strlen(dest), LOCAL_INFILE_ERROR_LEN-1));\
- php_error_docref(NULL TSRMLS_CC, E_WARNING, dest);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, dest);
/* {{{ php_local_infile_init
--
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.c mysqli_fe.c mysqli_mysqlnd.h mysqli_nonapi.c mysqli_prop.c php_mysqli_structs.h /ext/mysqli/tests 057.phpt bug37090.phpt mysqli_class_mysqli_inter
andrey Tue Nov 18 17:02:18 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/mysqli/tests mysqli_poll.phpt mysqli_poll_kill.phpt mysqli_poll_mixing_insert_select.phpt mysqli_poll_reference.phpt Modified files: /php-src/ext/mysqli mysqli.c mysqli_fe.c mysqli_mysqlnd.h mysqli_nonapi.c mysqli_prop.c php_mysqli_structs.h /php-src/ext/mysqli/tests 057.phpt bug37090.phpt mysqli_class_mysqli_interface.phpt mysqli_constants.phpt /php-src/ext/mysqlndmysqlnd.c mysqlnd.h mysqlnd_portability.h mysqlnd_structs.h Log: MFH: Asynchronous queries for mysqli, when mysqlnd is enabled. Includes 4 tests for mysqli_poll http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.31r2=1.72.2.16.2.17.2.32diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.31 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.32 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.31 Fri Oct 3 16:19:49 2008 +++ php-src/ext/mysqli/mysqli.c Tue Nov 18 17:02:17 2008 @@ -17,7 +17,7 @@ | Ulf Wendel [EMAIL PROTECTED] | +--+ - $Id: mysqli.c,v 1.72.2.16.2.17.2.31 2008/10/03 16:19:49 pajoye Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.32 2008/11/18 17:02:17 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -794,6 +794,9 @@ #if defined(MYSQLI_USE_MYSQLND) defined(MYSQLND_THREADED) REGISTER_LONG_CONSTANT(MYSQLI_BG_STORE_RESULT, MYSQLI_BG_STORE_RESULT, CONST_CS | CONST_PERSISTENT); #endif +#if defined (MYSQLI_USE_MYSQLND) + REGISTER_LONG_CONSTANT(MYSQLI_ASYNC, MYSQLI_ASYNC, CONST_CS | CONST_PERSISTENT); +#endif /* for mysqli_fetch_assoc */ REGISTER_LONG_CONSTANT(MYSQLI_ASSOC, MYSQLI_ASSOC, CONST_CS | CONST_PERSISTENT); http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.49.2.5.2.1.2.10r2=1.49.2.5.2.1.2.11diff_format=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.10 php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.11 --- php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.10Mon Nov 17 11:27:56 2008 +++ php-src/ext/mysqli/mysqli_fe.c Tue Nov 18 17:02:17 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.10 2008/11/17 11:27:56 felipe Exp $ + $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.11 2008/11/18 17:02:17 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -113,12 +113,18 @@ PHP_FE(mysqli_num_rows, NULL) PHP_FE(mysqli_options, NULL) PHP_FE(mysqli_ping, NULL) +#if defined(MYSQLI_USE_MYSQLND) + PHP_FE(mysqli_poll, NULL) +#endif PHP_FE(mysqli_prepare, NULL) PHP_FE(mysqli_report, NULL) PHP_FE(mysqli_query, NULL) PHP_FE(mysqli_real_connect, NULL) PHP_FE(mysqli_real_escape_string, NULL) PHP_FE(mysqli_real_query, NULL) +#if defined(MYSQLI_USE_MYSQLND) + PHP_FE(mysqli_reap_async_query, NULL) +#endif PHP_FE(mysqli_rollback, NULL) PHP_FE(mysqli_select_db, NULL) #ifdef HAVE_MYSQLI_SET_CHARSET @@ -219,6 +225,10 @@ PHP_FALIAS(query,mysqli_query,NULL) PHP_FALIAS(real_connect,mysqli_real_connect,NULL) PHP_FALIAS(real_escape_string,mysqli_real_escape_string,NULL) +#if defined(MYSQLI_USE_MYSQLND) + PHP_FALIAS(poll,mysqli_poll,NULL) + PHP_FALIAS(reap_async_query,mysqli_reap_async_query,NULL) +#endif PHP_FALIAS(escape_string, mysqli_real_escape_string,NULL) PHP_FALIAS(real_query,mysqli_real_query,NULL) PHP_FALIAS(rollback,mysqli_rollback,NULL) @@ -280,11 +290,11 @@ PHP_FALIAS(fetch,mysqli_stmt_fetch,NULL) PHP_FALIAS(get_warnings, mysqli_stmt_get_warnings, NULL) PHP_FALIAS(result_metadata, mysqli_stmt_result_metadata,NULL) - PHP_FALIAS(num_rows,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c
pajoye Fri Oct 3 16:19:49 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
Log:
- Declarations MUST BE done in the beginning of a context
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.30r2=1.72.2.16.2.17.2.31diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.30
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.31
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.30 Mon Sep 15 18:09:20 2008
+++ php-src/ext/mysqli/mysqli.c Fri Oct 3 16:19:49 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.30 2008/09/15 18:09:20 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.31 2008/10/03 16:19:49 pajoye Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -94,8 +94,8 @@
/* Destructor for mysqli entries in free_links/used_links */
void php_mysqli_dtor_p_elements(void *data)
{
- TSRMLS_FETCH();
MYSQL *mysql = (MYSQL *) data;
+ TSRMLS_FETCH();
mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT);
}
--
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.c mysqli_nonapi.c
andrey Tue May 6 17:05:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c mysqli_nonapi.c
Log:
Make mysqli compilable in a 5_2 environment. Some want to use mysqlnd+mysqli
with 5_2. This won't hurt 5_2 in any way. Won't be MFB-ed because HEAD is
completely different.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.23r2=1.72.2.16.2.17.2.24diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.23
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.23 Tue Mar 18 17:30:55 2008
+++ php-src/ext/mysqli/mysqli.c Tue May 6 17:05:14 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.23 2008/03/18 17:30:55 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.24 2008/05/06 17:05:14 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -512,6 +512,7 @@
} /* }}} */
+#if PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 3
HashTable * mysqli_object_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
{
mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object
TSRMLS_CC);
@@ -539,7 +540,7 @@
*is_temp = 1;
return retval;
}
-
+#endif
/* {{{ mysqli_objects_new
*/
@@ -708,7 +709,9 @@
mysqli_object_handlers.get_property_ptr_ptr =
std_hnd-get_property_ptr_ptr;
mysqli_object_handlers.get_constructor = php_mysqli_constructor_get;
mysqli_object_handlers.has_property = mysqli_object_has_property;
+#if PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 3
mysqli_object_handlers.get_debug_info = mysqli_object_get_debug_info;
+#endif
zend_hash_init(classes, 0, NULL, NULL, 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.11r2=1.54.2.7.2.5.2.12diff_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.11
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.12
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.11Thu Apr 24
14:22:19 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue May 6 17:05:14 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.11 2008/04/24 14:22:19 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.12 2008/05/06 17:05:14 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -33,6 +33,11 @@
#define SAFE_STR(a) ((a)?a:)
+#ifndef zend_parse_parameters_none
+#define zend_parse_parameters_none() \
+zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, )
+#endif
+
/* {{{ php_mysqli_set_error
*/
static void php_mysqli_set_error(long mysql_errno, char *mysql_err TSRMLS_DC)
--
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.c
andrey Tue Mar 18 17:30:55 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
Log:
Fix the build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.22r2=1.72.2.16.2.17.2.23diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.22
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.23
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.22 Tue Mar 18 16:57:30 2008
+++ php-src/ext/mysqli/mysqli.c Tue Mar 18 17:30:55 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.22 2008/03/18 16:57:30 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.23 2008/03/18 17:30:55 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -977,9 +977,7 @@
*/
PHP_MINFO_FUNCTION(mysqli)
{
-#if defined(MYSQLI_USE_MYSQLND)
char buf[32];
-#endif
php_info_print_table_start();
php_info_print_table_header(2, MysqlI Support, enabled);
--
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.c
johannesMon Mar 10 13:39:54 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli.c Log: Fix typo http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.19r2=1.72.2.16.2.17.2.20diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u 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.20 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.19 Sat Mar 8 15:00:50 2008 +++ php-src/ext/mysqli/mysqli.c Mon Mar 10 13:39:53 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli.c,v 1.72.2.16.2.17.2.19 2008/03/08 15:00:50 andrey Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.20 2008/03/10 13:39:53 johannes Exp $ */ #ifdef HAVE_CONFIG_H @@ -725,7 +725,9 @@ REGISTER_LONG_CONSTANT(MYSQLI_GROUP_FLAG, GROUP_FLAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_ENUM_FLAG, ENUM_FLAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_BINARY_FLAG, BINARY_FLAG, CONST_CS | CONST_PERSISTENT); +#if MYSQL_VERSION_ID 50001 || defined(HAVE_MYSQLND) REGISTER_LONG_CONSTANT(MYSQLI_NO_DEFAULT_VALUE_FLAG, NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT); +#endif #if (MYSQL_VERSION_ID 51122 MYSQL_VERSION_ID 6) || (MYSQL_VERSION_ID 60003) || defined(HAVE_MYSQLND) REGISTER_LONG_CONSTANT(MYSQLI_ON_UPDATE_NOW_FLAG, ON_UPDATE_NOW_FLAG, CONST_CS | CONST_PERSISTENT); -- 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.c mysqli_api.c mysqli_fe.c mysqli_nonapi.c php_mysqli_structs.h /ext/mysqli/tests bug39457.phpt
andrey Sat Mar 8 14:55:52 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests bug39457.phpt
Modified files:
/php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_fe.c
mysqli_nonapi.c php_mysqli_structs.h
Log:
Fix a problem with $mysqi-connect() not working with default values.
Fix a leak, bug#39457
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.17r2=1.72.2.16.2.17.2.18diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.17
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.17 Mon Feb 18 13:28:48 2008
+++ php-src/ext/mysqli/mysqli.c Sat Mar 8 14:55:52 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.17 2008/02/18 13:28:48 iliaa Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.18 2008/03/08 14:55:52 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -54,9 +54,6 @@
MYSQLND_QCACHE *mysqli_mysqlnd_qcache;
#endif
-
-extern void php_mysqli_connect(INTERNAL_FUNCTION_PARAMETERS);
-
typedef int (*mysqli_read_t)(mysqli_object *obj, zval **retval TSRMLS_DC);
typedef int (*mysqli_write_t)(mysqli_object *obj, zval *newval TSRMLS_DC);
@@ -433,7 +430,7 @@
f.type = ZEND_INTERNAL_FUNCTION;
if (obj-zo.ce == mysqli_link_class_entry) {
- f.handler = ZEND_FN(mysqli_connect);
+ f.handler = ZEND_FN(mysqli_link_construct);
} else if (obj-zo.ce == mysqli_stmt_class_entry) {
f.handler = ZEND_FN(mysqli_stmt_construct);
} else if (obj-zo.ce == mysqli_result_class_entry) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.12r2=1.118.2.22.2.16.2.13diff_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.12
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.13
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.12Wed Feb 6
11:34:43 2008
+++ php-src/ext/mysqli/mysqli_api.c Sat Mar 8 14:55:52 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.12 2008/02/06 11:34:43 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.13 2008/03/08 14:55:52 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1595,7 +1595,7 @@
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_real_connect)
{
- mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE);
+ mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE, FALSE);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.49.2.5.2.1.2.4r2=1.49.2.5.2.1.2.5diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.4
php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.5
--- php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.4 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqli/mysqli_fe.c Sat Mar 8 14:55:52 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.4 2007/12/31 07:17:10 sebastian Exp $
+ $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.5 2008/03/08 14:55:52 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -209,7 +209,7 @@
PHP_FALIAS(set_local_infile_handler,mysqli_set_local_infile_handler,NULL)
#endif
PHP_FALIAS(multi_query,mysqli_multi_query,NULL)
- PHP_FALIAS(mysqli,mysqli_connect,NULL)
+ PHP_FALIAS(mysqli,mysqli_link_construct,NULL)
PHP_FALIAS(more_results,mysqli_more_results, NULL)
PHP_FALIAS(next_result, mysqli_next_result, NULL)
PHP_FALIAS(options,mysqli_options,NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.6r2=1.54.2.7.2.5.2.7diff_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.6
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.7
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.6 Wed Feb 6 11:34:43 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Sat Mar 8 14:55:52 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.6 2008/02/06 11:34:43 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.7 2008/03/08 14:55:52 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -33,7 +33,7 @@
#define SAFE_STR(a) ((a)?a:)
-void
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c
iliaa Mon Feb 18 13:28:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
Log:
Fixed a possible crash
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.16r2=1.72.2.16.2.17.2.17diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.16
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.17
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.16 Tue Feb 12 22:05:34 2008
+++ php-src/ext/mysqli/mysqli.c Mon Feb 18 13:28:48 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.16 2008/02/12 22:05:34 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.17 2008/02/18 13:28:48 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1403,7 +1403,9 @@
return;
}
- php_stream_close(mysql-li_stream);
+ if (mysql-li_stream) {
+ php_stream_close(mysql-li_stream);
+ }
free(data);
return;
}
--
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.c /ext/mysqlnd mysqlnd.h mysqlnd_debug.c mysqlnd_debug.h mysqlnd_enum_n_def.h mysqlnd_structs.h
On 11.02.2008 19:44, Andrey Hristov wrote: + REGISTER_LONG_CONSTANT(MYSQLI_ENUM_FLAG, ENUM_FLAG, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(MYSQLI_BINARY_FLAG, BINARY_FLAG, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(MYSQLI_NO_DEFAULT_VALUE_FLAG, NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT); + +#if (MYSQL_VERSION_ID 51122 MYSQL_VERSION_ID 6) || (MYSQLI_VERSION_ID 60003) || defined(HAVE_MYSQLND) ^ typo ?? + REGISTER_LONG_CONSTANT(MYSQLI_ON_UPDATE_NOW_FLAG, ON_UPDATE_NOW_FLAG, CONST_CS | CONST_PERSISTENT); +#endif /local/qa/5_3.gcov/ext/mysqli/mysqli.c: In function 'zm_startup_mysqli': /local/qa/5_3.gcov/ext/mysqli/mysqli.c:733: error: 'ON_UPDATE_NOW_FLAG' undeclared (first use in this function) /local/qa/5_3.gcov/ext/mysqli/mysqli.c:733: error: (Each undeclared identifier is reported only once /local/qa/5_3.gcov/ext/mysqli/mysqli.c:733: error: for each function it appears in.) -- Wbr, Antony Dovgal -- 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.c
andrey Tue Feb 12 10:51:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli.c Log: Fix typo http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.12r2=1.72.2.16.2.17.2.13diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.12 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.13 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.12 Mon Feb 11 16:44:48 2008 +++ php-src/ext/mysqli/mysqli.c Tue Feb 12 10:51:39 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli.c,v 1.72.2.16.2.17.2.12 2008/02/11 16:44:48 andrey Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.13 2008/02/12 10:51:39 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -729,7 +729,7 @@ REGISTER_LONG_CONSTANT(MYSQLI_BINARY_FLAG, BINARY_FLAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_NO_DEFAULT_VALUE_FLAG, NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT); -#if (MYSQL_VERSION_ID 51122 MYSQL_VERSION_ID 6) || (MYSQLI_VERSION_ID 60003) || defined(HAVE_MYSQLND) +#if (MYSQL_VERSION_ID 51122 MYSQL_VERSION_ID 6) || (MYSQL_VERSION_ID 60003) || defined(HAVE_MYSQLND) REGISTER_LONG_CONSTANT(MYSQLI_ON_UPDATE_NOW_FLAG, ON_UPDATE_NOW_FLAG, CONST_CS | CONST_PERSISTENT); #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.c
tony2001Tue Feb 12 10:54:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.13r2=1.72.2.16.2.17.2.14diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.13
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.14
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.13 Tue Feb 12 10:51:39 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 10:54:54 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.13 2008/02/12 10:51:39 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.14 2008/02/12 10:54:54 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -72,7 +72,6 @@
void php_mysqli_dtor_p_elements(void *data)
{
MYSQL *mysql = (MYSQL *) data;
- TSRMLS_FETCH();
#if defined(HAVE_MYSQLND)
mysqlnd_end_psession(mysql);
#endif
--
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.c
Windows build still seems to be broken: mysqli.c c:\projects\php-5.3\zend\zend_execute.h(229) : warning C4018: '' : signed/unsigned mismatch ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2065: 'ifdef' : undeclared identifier ext\mysqli\mysqli.c(792) : error C2146: syntax error : missing ')' before identifier 'HAVE_MYSQLND' ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(1341) : warning C4018: '' : signed/unsigned mismatch Looks like VC compiler doesn't like nested macros. -- Stanislav Malyshev, Zend Software Architect [EMAIL PROTECTED] http://www.zend.com/ (408)253-8829 MSN: [EMAIL PROTECTED] -- 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.c
andrey Tue Feb 12 22:05:34 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli.c Log: Fix windows build - VC doesn't like nested macros http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.15r2=1.72.2.16.2.17.2.16diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.15 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.16 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.15 Tue Feb 12 20:19:21 2008 +++ php-src/ext/mysqli/mysqli.c Tue Feb 12 22:05:34 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli.c,v 1.72.2.16.2.17.2.15 2008/02/12 20:19:21 johannes Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.16 2008/02/12 22:05:34 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -781,17 +781,16 @@ REGISTER_LONG_CONSTANT(MYSQLI_REPORT_ALL, MYSQLI_REPORT_ALL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_REPORT_OFF, 0, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, + /* We use non-nested macros with expansion, as VC has problems */ #ifdef HAVE_MYSQLND - MYSQLND_DBG_ENABLED + REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, MYSQLND_DBG_ENABLED, CONST_CS | CONST_PERSISTENT); #else #ifndef DBUG_OFF - 0 + REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, 0, CONST_CS | CONST_PERSISTENT); #else - 1 + REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED, 1, CONST_CS | CONST_PERSISTENT); #endif #endif - , CONST_CS | CONST_PERSISTENT); return SUCCESS; } -- 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.c
johannesTue Feb 12 20:19:21 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
Log:
MFH: - Fix build with TSRM and mysqlnd
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.14r2=1.72.2.16.2.17.2.15diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.14
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.15
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.14 Tue Feb 12 10:54:54 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 20:19:21 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.14 2008/02/12 10:54:54 tony2001 Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.15 2008/02/12 20:19:21 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -73,6 +73,8 @@
{
MYSQL *mysql = (MYSQL *) data;
#if defined(HAVE_MYSQLND)
+ TSRMLS_FETCH();
+
mysqlnd_end_psession(mysql);
#endif
mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT);
--
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.c /ext/mysqlnd mysqlnd.h mysqlnd_debug.c mysqlnd_debug.h mysqlnd_enum_n_def.h mysqlnd_structs.h
andrey Mon Feb 11 16:44:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqlndmysqlnd.h mysqlnd_debug.c mysqlnd_debug.h
mysqlnd_enum_n_def.h mysqlnd_structs.h
Log:
cvs sync
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.11r2=1.72.2.16.2.17.2.12diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.11
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.12
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.11 Wed Feb 6 11:34:43 2008
+++ php-src/ext/mysqli/mysqli.c Mon Feb 11 16:44:48 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.11 2008/02/06 11:34:43 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.12 2008/02/11 16:44:48 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -725,6 +725,13 @@
REGISTER_LONG_CONSTANT(MYSQLI_NUM_FLAG, NUM_FLAG, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_PART_KEY_FLAG, PART_KEY_FLAG, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_GROUP_FLAG, GROUP_FLAG, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(MYSQLI_ENUM_FLAG, ENUM_FLAG, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(MYSQLI_BINARY_FLAG, BINARY_FLAG, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(MYSQLI_NO_DEFAULT_VALUE_FLAG,
NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT);
+
+#if (MYSQL_VERSION_ID 51122 MYSQL_VERSION_ID 6) ||
(MYSQLI_VERSION_ID 60003) || defined(HAVE_MYSQLND)
+ REGISTER_LONG_CONSTANT(MYSQLI_ON_UPDATE_NOW_FLAG, ON_UPDATE_NOW_FLAG,
CONST_CS | CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT(MYSQLI_TYPE_DECIMAL, FIELD_TYPE_DECIMAL,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_TYPE_TINY, FIELD_TYPE_TINY, CONST_CS |
CONST_PERSISTENT);
@@ -773,6 +780,18 @@
REGISTER_LONG_CONSTANT(MYSQLI_REPORT_ALL, MYSQLI_REPORT_ALL, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_REPORT_OFF, 0, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(MYSQLI_DEBUG_TRACE_ENABLED,
+#ifdef HAVE_MYSQLND
+ MYSQLND_DBG_ENABLED
+#else
+#ifndef DBUG_OFF
+ 0
+#else
+ 1
+#endif
+#endif
+ , CONST_CS | CONST_PERSISTENT);
+
return SUCCESS;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.3.2.8r2=1.3.2.9diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.3.2.8
php-src/ext/mysqlnd/mysqlnd.h:1.3.2.9
--- php-src/ext/mysqlnd/mysqlnd.h:1.3.2.8 Tue Jan 29 18:11:46 2008
+++ php-src/ext/mysqlnd/mysqlnd.h Mon Feb 11 16:44:48 2008
@@ -18,12 +18,12 @@
+--+
*/
-/* $Id: mysqlnd.h,v 1.3.2.8 2008/01/29 18:11:46 andrey Exp $ */
+/* $Id: mysqlnd.h,v 1.3.2.9 2008/02/11 16:44:48 andrey Exp $ */
#ifndef MYSQLND_H
#define MYSQLND_H
-#define MYSQLND_VERSION mysqlnd 5.0.3-dev - 080129 - $Revision: 1.3.2.8 $
+#define MYSQLND_VERSION mysqlnd 5.0.3-dev - 080129 - $Revision: 1.3.2.9 $
#define MYSQLND_VERSION_ID 50002
/* This forces inlining of some accessor functions */
@@ -46,6 +46,12 @@
#define MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND 1
#endif
+#if PHP_DEBUG !defined(PHP_WIN32)
+#define MYSQLND_DBG_ENABLED 1
+#else
+#define MYSQLND_DBG_ENABLED 0
+#endif
+
#ifdef ZTS
#include TSRM.h
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.c?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.c
diff -u php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.4
php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.5
--- php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.4 Wed Jan 23 19:11:28 2008
+++ php-src/ext/mysqlnd/mysqlnd_debug.c Mon Feb 11 16:44:48 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_debug.c,v 1.1.2.4 2008/01/23 19:11:28 andrey Exp $ */
+/* $Id: mysqlnd_debug.c,v 1.1.2.5 2008/02/11 16:44:48 andrey Exp $ */
#include php.h
#include mysqlnd.h
@@ -433,7 +433,8 @@
}
i = j;
} else {
- self-file_name = (char *)
mysqlnd_debug_default_trace_file;
+ if (!self-file_name)
+ self-file_name = (char *)
mysqlnd_debug_default_trace_file;
}
state = PARSER_WAIT_COLON;
break;
@@ -491,9 +492,10 @@
if ((i + 1) mode_len mode[i+1] == ',') {
i+= 2;
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c php_mysqli_structs.h /ext/mysqli/tests mysqli_real_connect.phpt mysqli_real_connect_pconn.phpt /ext/mysqlnd mysqlnd_
andrey Wed Feb 6 11:34:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c
php_mysqli_structs.h
/php-src/ext/mysqli/tests mysqli_real_connect.phpt
mysqli_real_connect_pconn.phpt
/php-src/ext/mysqlndmysqlnd_result.c
Log:
Pconnect working with mysqli_real_connect(). To less failing tests.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.10r2=1.72.2.16.2.17.2.11diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.10
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.11
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.10 Mon Jan 28 18:25:49 2008
+++ php-src/ext/mysqli/mysqli.c Wed Feb 6 11:34:43 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.10 2008/01/28 18:25:49 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.11 2008/02/06 11:34:43 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -687,7 +687,7 @@
/* for mysqli_query */
REGISTER_LONG_CONSTANT(MYSQLI_STORE_RESULT, MYSQLI_STORE_RESULT,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_USE_RESULT, MYSQLI_USE_RESULT, CONST_CS
| CONST_PERSISTENT);
-#if defined(HAVE_MYSQLND) defined(MYSQLND_THREADING)
+#if defined(HAVE_MYSQLND) defined(MYSQLND_THREADED)
REGISTER_LONG_CONSTANT(MYSQLI_BG_STORE_RESULT,
MYSQLI_BG_STORE_RESULT, CONST_CS | CONST_PERSISTENT);
#endif
@@ -984,7 +984,7 @@
case MYSQLI_USE_RESULT:
result = mysql_use_result(mysql-mysql);
break;
-#if defined(HAVE_MYSQLND) defined(MYSQLND_THREADING)
+#if defined(HAVE_MYSQLND) defined(MYSQLND_THREADED)
case MYSQLI_BG_STORE_RESULT:
result = mysqli_bg_store_result(mysql-mysql);
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.11r2=1.118.2.22.2.16.2.12diff_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.11
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.12
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.11Tue Jan 1
18:13:14 2008
+++ php-src/ext/mysqli/mysqli_api.c Wed Feb 6 11:34:43 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.11 2008/01/01 18:13:14 hholzgra Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.12 2008/02/06 11:34:43 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1259,7 +1259,11 @@
#if !defined(HAVE_MYSQLND)
if (!(mysql-mysql = mysql_init(NULL)))
#else
- if (!(mysql-mysql = mysql_init(FALSE)))
+ /*
+ We create always persistent, as if the user want to connecto
+ to p:somehost, we can't convert the handle then
+ */
+ if (!(mysql-mysql = mysql_init(TRUE)))
#endif
{
efree(mysql);
@@ -1586,83 +1590,16 @@
}
/* }}} */
+
/* {{{ proto bool mysqli_real_connect(object link [,string hostname [,string
username [,string passwd [,string dbname [,int port [,string socket [,int
flags]]])
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_real_connect)
{
- MY_MYSQL*mysql;
- char*hostname = NULL, *username=NULL, *passwd=NULL,
*dbname=NULL, *socket=NULL;
- unsigned inthostname_len = 0, username_len = 0, passwd_len = 0,
dbname_len = 0, socket_len = 0;
- unsigned long port=0, flags=0;
- zval*mysql_link;
-
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
O|lsl, mysql_link, mysqli_link_class_entry,
- hostname, hostname_len, username, username_len, passwd,
passwd_len, dbname, dbname_len, port, socket, socket_len,
- flags) == FAILURE) {
- return;
- }
-
- if (!socket_len) {
- socket = NULL;
- }
- if (!socket) {
- socket = MyG(default_socket);
- }
- if (!passwd) {
- passwd = MyG(default_pw);
- passwd_len = strlen(passwd);
- }
- if (!username){
- username = MyG(default_user);
- }
- if (!hostname) {
- hostname = MyG(default_host);
- }
-
- 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 =
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c mysqli_mysqlnd.h mysqli_nonapi.c mysqli_prop.c php_mysqli_structs.h /ext/mysqli/tests mysqli_get_client_stats.phpt /ext/mysqlnd mysqlnd.c mys
Hi Andrey, The win32 build is completely broken because of ext/mysqlnd. Thanks. Dmitry. Andrey Hristov wrote: andrey Mon Jan 28 18:25:51 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli.c mysqli_mysqlnd.h mysqli_nonapi.c mysqli_prop.c php_mysqli_structs.h /php-src/ext/mysqli/tests mysqli_get_client_stats.phpt /php-src/ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_enum_n_def.h mysqlnd_libmysql_compat.h mysqlnd_priv.h mysqlnd_ps.c mysqlnd_result.c mysqlnd_result.h mysqlnd_result_meta.c mysqlnd_structs.h mysqlnd_wireprotocol.c mysqlnd_wireprotocol.h Log: More optimizations - less MM calls Clearly separated fetching (physical reading) from decoding phases (data interpretation). Threaded fetching added but disabled as needs more work for Windows. For Linux needs some touches to add pthreads if this is enabled, probably with a compile-time switch. The code reorganisation makes it easy to add also async API, similar to cURL's one. -- 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.c /ext/mysqli/tests mysqli_master_query.phpt
johannesThu Jan 3 14:33:46 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/mysqli/tests mysqli_master_query.phpt Modified files: /php-src/ext/mysqli mysqli.c Log: - MFH: Remove more replication stuff http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.8r2=1.72.2.16.2.17.2.9diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.8 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.9 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.8 Mon Dec 31 07:17:10 2007 +++ php-src/ext/mysqli/mysqli.c Thu Jan 3 14:33:46 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli.c,v 1.72.2.16.2.17.2.8 2007/12/31 07:17:10 sebastian Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.9 2008/01/03 14:33:46 johannes Exp $ */ #ifdef HAVE_CONFIG_H @@ -760,13 +760,6 @@ REGISTER_LONG_CONSTANT(MYSQLI_SET_CHARSET_NAME, MYSQL_SET_CHARSET_NAME, CONST_CS | CONST_PERSISTENT); - /* replication */ -#if !defined(HAVE_MYSQLND) - REGISTER_LONG_CONSTANT(MYSQLI_RPL_MASTER, MYSQL_RPL_MASTER, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(MYSQLI_RPL_SLAVE, MYSQL_RPL_SLAVE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(MYSQLI_RPL_ADMIN, MYSQL_RPL_ADMIN, CONST_CS | CONST_PERSISTENT); -#endif - /* bind support */ REGISTER_LONG_CONSTANT(MYSQLI_NO_DATA, MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT); #ifdef MYSQL_DATA_TRUNCATED -- 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.c mysqli_api.c mysqli_nonapi.c php_mysqli_structs.h
andrey Fri Nov 9 10:56:28 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c
php_mysqli_structs.h
Log:
Fix crash with pconnect
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.6r2=1.72.2.16.2.17.2.7diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.6
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.7
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.6 Wed Oct 17 08:18:09 2007
+++ php-src/ext/mysqli/mysqli.c Fri Nov 9 10:56:28 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.6 2007/10/17 08:18:09 tony2001 Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.7 2007/11/09 10:56:28 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -70,50 +70,25 @@
static int le_pmysqli;
-static int php_mysqli_persistent_on_rshut(zend_rsrc_list_entry *le TSRMLS_DC)
-{
- if (le-type == le_pmysqli) {
- mysqli_plist_entry *plist = (mysqli_plist_entry *) le-ptr;
- HashPosition pos;
- MYSQL **mysql;
- ulong idx;
- dtor_func_t pDestructor = plist-used_links.pDestructor;
- plist-used_links.pDestructor = NULL; /* Don't call pDestructor
now */
-
- zend_hash_internal_pointer_reset_ex(plist-used_links, pos);
- while (SUCCESS ==
zend_hash_get_current_data_ex(plist-used_links, (void **)mysql, pos)) {
- zend_hash_get_current_key_ex(plist-used_links, NULL,
NULL, idx, FALSE, pos);
- /* Make it free */
- zend_hash_next_index_insert(plist-free_links, mysql,
sizeof(MYSQL *), NULL);
- /* First move forward */
- zend_hash_move_forward_ex(plist-used_links, pos);
- /* The delete, because del will free memory, but we
need it's -nextItem */
- zend_hash_index_del(plist-used_links, idx);
- }
-
- /* restore pDestructor, which should be
php_mysqli_dtor_p_elements() */
- plist-used_links.pDestructor = pDestructor;
- }
- return ZEND_HASH_APPLY_KEEP;
-}
/* Destructor for mysqli entries in free_links/used_links */
void php_mysqli_dtor_p_elements(void *data)
{
- MYSQL **mysql = (MYSQL **) data;
+ MYSQL *mysql = (MYSQL *) data;
TSRMLS_FETCH();
#if defined(HAVE_MYSQLND)
- mysqlnd_end_psession(*mysql);
+ mysqlnd_end_psession(mysql);
#endif
- mysqli_close(*mysql, MYSQLI_CLOSE_IMPLICIT);
+ mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT);
}
+/* le_pmysqli dtor*/
ZEND_RSRC_DTOR_FUNC(php_mysqli_dtor)
{
if (rsrc-ptr) {
mysqli_plist_entry *plist = (mysqli_plist_entry *) rsrc-ptr;
- zend_hash_destroy(plist-free_links);
- zend_hash_destroy(plist-used_links);
+ zend_ptr_stack_clean(plist-free_links,
php_mysqli_dtor_p_elements, 0);
+ zend_ptr_stack_destroy(plist-free_links);
free(plist);
}
}
@@ -222,6 +197,8 @@
}
/* }}} */
+/* mysqli_link_free_storage partly doubles the work of
PHP_FUNCTION(mysqli_close) */
+
/* {{{ mysqli_link_free_storage
*/
static void mysqli_link_free_storage(void *object TSRMLS_DC)
@@ -235,6 +212,19 @@
if (mysql-mysql) {
if (!mysql-persistent) {
mysqli_close(mysql-mysql,
MYSQLI_CLOSE_IMPLICIT);
+ } else {
+ zend_rsrc_list_entry *le;
+ if (zend_hash_find(EG(persistent_list),
mysql-hash_key, strlen(mysql-hash_key) + 1, (void **)le) == SUCCESS) {
+ if (Z_TYPE_P(le) == php_le_pmysqli()) {
+ mysqli_plist_entry *plist =
(mysqli_plist_entry *) le-ptr;
+
+
zend_ptr_stack_push(plist-free_links, mysql-mysql);
+
+ MyG(num_links)--;
+ MyG(num_active_persistent)--;
+ MyG(num_inactive_persistent)++;
+ }
+ }
}
}
php_clear_mysql(mysql);
@@ -854,7 +844,6 @@
PHP_RSHUTDOWN_FUNCTION(mysqli)
{
/* check persistent connections, move used to free */
- zend_hash_apply(EG(persistent_list), (apply_func_t)
php_mysqli_persistent_on_rshut TSRMLS_CC);
#if !defined(HAVE_MYSQLND) defined(ZTS) MYSQL_VERSION_ID = 4
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c /ext/mysqlnd mysqlnd_priv.h
Hello Andi,
he's not replicating them, he added them as a fallback. Which allows him
to use the same sources for 5.2 - I guess.
marcus
Sunday, October 28, 2007, 4:31:59 AM, you wrote:
Hi Andrey,
Are you sure it's a good idea to replicate these macros? It kind of
breaks the ability to tweak them in a central place.
What's the reasoning for it?
Andi
-Original Message-
From: Andrey Hristov [mailto:[EMAIL PROTECTED]
Sent: Tuesday, October 16, 2007 1:56 PM
To: php-cvs@lists.php.net
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c
/ext/mysqlnd mysqlnd_priv.h
andreyTue Oct 16 20:56:22 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqlnd mysqlnd_priv.h
Log:
Sync mysqlnd. Should still compile with 5_2 for those who want to
use
the
current stable branch. mysqli from 5_3 patched for mysqlnd should be
also
compilable with 5_2.
http://cvs.php.net/viewvc.cgi/php-
src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.4r2=1.72.2.16.2.17.2.5dif
f_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.4 php-
src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.4Tue Oct 16
13:20:14 2007
+++ php-src/ext/mysqli/mysqli.c Tue Oct 16 20:56:22 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]
|
+---
---+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.4 2007/10/16 13:20:14 tony2001 Exp
$
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.5 2007/10/16 20:56:22 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -315,6 +315,14 @@
}
/* }}} */
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)
(++(pz)-refcount)
+#define Z_REFCOUNT_P(pz) ((pz)-refcount)
+#define Z_SET_REFCOUNT_P(pz, rc) ((pz)-refcount = rc)
+#endif
+
+
/* {{{ mysqli_read_property */
zval *mysqli_read_property(zval *object, zval *member, int type
TSRMLS_DC)
{
http://cvs.php.net/viewvc.cgi/php-
src/ext/mysqlnd/mysqlnd_priv.h?r1=1.4.2.2r2=1.4.2.3diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_priv.h
diff -u php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.2 php-
src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.3
--- php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.2Fri Oct 5
21:23:56
2007
+++ php-src/ext/mysqlnd/mysqlnd_priv.hTue Oct 16 20:56:22 2007
@@ -18,11 +18,21 @@
+---
---+
*/
-/* $Id: mysqlnd_priv.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.4.2.3 2007/10/16 20:56:22 andrey Exp $ */
#ifndef MYSQLND_PRIV_H
#define MYSQLND_PRIV_H
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)
(++(pz)-refcount)
+#define Z_DELREF_P(pz)
(--(pz)-refcount)
+#define Z_REFCOUNT_P(pz) ((pz)-refcount)
+#define Z_SET_REFCOUNT_P(pz, rc) ((pz)-refcount = rc)
+#define Z_REFCOUNT_PP(ppz) Z_REFCOUNT_P(*(ppz))
+#define Z_DELREF_PP(ppz) Z_DELREF_P(*(ppz))
+#endif
+
#ifdef ZTS
#include TSRM.h
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Best regards,
Marcus
--
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.c /ext/mysqlnd mysqlnd_priv.h
Hi helly, Andi
Marcus Boerger wrote:
Hello Andi,
he's not replicating them, he added them as a fallback. Which allows him
to use the same sources for 5.2 - I guess.
right, mysqlnd currently has one code base (stored in two branches).
There are people, and probably there will be more that would like to try
mysqlnd with 5.2 . Is there a new number of the extension API version,
which I could use instead of checking whether some macros are defined?
marcus
Sunday, October 28, 2007, 4:31:59 AM, you wrote:
Hi Andrey,
Are you sure it's a good idea to replicate these macros? It kind of
breaks the ability to tweak them in a central place.
What's the reasoning for it?
Andi
-Original Message-
From: Andrey Hristov [mailto:[EMAIL PROTECTED]
Sent: Tuesday, October 16, 2007 1:56 PM
To: php-cvs@lists.php.net
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c
/ext/mysqlnd mysqlnd_priv.h
andreyTue Oct 16 20:56:22 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqlnd mysqlnd_priv.h
Log:
Sync mysqlnd. Should still compile with 5_2 for those who want to
use
the
current stable branch. mysqli from 5_3 patched for mysqlnd should be
also
compilable with 5_2.
http://cvs.php.net/viewvc.cgi/php-
src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.4r2=1.72.2.16.2.17.2.5dif
f_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.4 php-
src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.4Tue Oct 16
13:20:14 2007
+++ php-src/ext/mysqli/mysqli.c Tue Oct 16 20:56:22 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]
|
+---
---+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.4 2007/10/16 13:20:14 tony2001 Exp
$
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.5 2007/10/16 20:56:22 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -315,6 +315,14 @@
}
/* }}} */
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)
(++(pz)-refcount)
+#define Z_REFCOUNT_P(pz) ((pz)-refcount)
+#define Z_SET_REFCOUNT_P(pz, rc) ((pz)-refcount = rc)
+#endif
+
+
/* {{{ mysqli_read_property */
zval *mysqli_read_property(zval *object, zval *member, int type
TSRMLS_DC)
{
http://cvs.php.net/viewvc.cgi/php-
src/ext/mysqlnd/mysqlnd_priv.h?r1=1.4.2.2r2=1.4.2.3diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_priv.h
diff -u php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.2 php-
src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.3
--- php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.2Fri Oct 5
21:23:56
2007
+++ php-src/ext/mysqlnd/mysqlnd_priv.hTue Oct 16 20:56:22 2007
@@ -18,11 +18,21 @@
+---
---+
*/
-/* $Id: mysqlnd_priv.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.4.2.3 2007/10/16 20:56:22 andrey Exp $ */
#ifndef MYSQLND_PRIV_H
#define MYSQLND_PRIV_H
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)
(++(pz)-refcount)
+#define Z_DELREF_P(pz)
(--(pz)-refcount)
+#define Z_REFCOUNT_P(pz) ((pz)-refcount)
+#define Z_SET_REFCOUNT_P(pz, rc) ((pz)-refcount = rc)
+#define Z_REFCOUNT_PP(ppz) Z_REFCOUNT_P(*(ppz))
+#define Z_DELREF_PP(ppz) Z_DELREF_P(*(ppz))
+#endif
+
#ifdef ZTS
#include TSRM.h
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Best regards,
Marcus
Regards,
Andrey
--
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.c /ext/mysqlnd mysqlnd_priv.h
Hi Andrey,
Are you sure it's a good idea to replicate these macros? It kind of
breaks the ability to tweak them in a central place.
What's the reasoning for it?
Andi
-Original Message-
From: Andrey Hristov [mailto:[EMAIL PROTECTED]
Sent: Tuesday, October 16, 2007 1:56 PM
To: php-cvs@lists.php.net
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c
/ext/mysqlnd mysqlnd_priv.h
andreyTue Oct 16 20:56:22 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqlnd mysqlnd_priv.h
Log:
Sync mysqlnd. Should still compile with 5_2 for those who want to
use
the
current stable branch. mysqli from 5_3 patched for mysqlnd should be
also
compilable with 5_2.
http://cvs.php.net/viewvc.cgi/php-
src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.4r2=1.72.2.16.2.17.2.5dif
f_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.4 php-
src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.4Tue Oct 16
13:20:14 2007
+++ php-src/ext/mysqli/mysqli.c Tue Oct 16 20:56:22 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]
|
+---
---+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.4 2007/10/16 13:20:14 tony2001 Exp
$
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.5 2007/10/16 20:56:22 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -315,6 +315,14 @@
}
/* }}} */
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)
(++(pz)-refcount)
+#define Z_REFCOUNT_P(pz) ((pz)-refcount)
+#define Z_SET_REFCOUNT_P(pz, rc) ((pz)-refcount = rc)
+#endif
+
+
/* {{{ mysqli_read_property */
zval *mysqli_read_property(zval *object, zval *member, int type
TSRMLS_DC)
{
http://cvs.php.net/viewvc.cgi/php-
src/ext/mysqlnd/mysqlnd_priv.h?r1=1.4.2.2r2=1.4.2.3diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_priv.h
diff -u php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.2 php-
src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.3
--- php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.2Fri Oct 5
21:23:56
2007
+++ php-src/ext/mysqlnd/mysqlnd_priv.hTue Oct 16 20:56:22 2007
@@ -18,11 +18,21 @@
+---
---+
*/
-/* $Id: mysqlnd_priv.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.4.2.3 2007/10/16 20:56:22 andrey Exp $ */
#ifndef MYSQLND_PRIV_H
#define MYSQLND_PRIV_H
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)
(++(pz)-refcount)
+#define Z_DELREF_P(pz)
(--(pz)-refcount)
+#define Z_REFCOUNT_P(pz) ((pz)-refcount)
+#define Z_SET_REFCOUNT_P(pz, rc) ((pz)-refcount = rc)
+#define Z_REFCOUNT_PP(ppz) Z_REFCOUNT_P(*(ppz))
+#define Z_DELREF_PP(ppz) Z_DELREF_P(*(ppz))
+#endif
+
#ifdef ZTS
#include TSRM.h
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
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.c mysqli_api.c
tony2001Wed Oct 17 08:18:09 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c mysqli.c
Log:
MFH: use correct dtro and variable for the callback
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.4r2=1.118.2.22.2.16.2.5diff_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.4
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.4 Tue Oct 16 13:20:14 2007
+++ php-src/ext/mysqli/mysqli_api.c Wed Oct 17 08:18:09 2007
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.4 2007/10/16 13:20:14 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.5 2007/10/17 08:18:09 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1336,7 +1336,7 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link,
MYSQLI_STATUS_VALID);
if (mysql-li_read) {
- zval_dtor(mysql-li_read);
+ zval_ptr_dtor((mysql-li_read));
mysql-li_read = NULL;
}
}
@@ -1364,7 +1364,6 @@
efree(callback_name);
RETURN_FALSE;
}
- efree(callback_name);
/* save callback function */
if (!mysql-li_read) {
@@ -1372,7 +1371,7 @@
} else {
zval_dtor(mysql-li_read);
}
- ZVAL_STRINGL(mysql-li_read, Z_STRVAL_P(callback_func),
Z_STRLEN_P(callback_func), 1);
+ ZVAL_STRINGL(mysql-li_read, callback_name, 0);
RETURN_TRUE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.5r2=1.72.2.16.2.17.2.6diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.6
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5 Tue Oct 16 20:56:22 2007
+++ php-src/ext/mysqli/mysqli.c Wed Oct 17 08:18:09 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.5 2007/10/16 20:56:22 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.6 2007/10/17 08:18:09 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -202,7 +202,7 @@
mysql-hash_key = NULL;
}
if (mysql-li_read) {
- zval_dtor(mysql-li_read);
+ zval_ptr_dtor((mysql-li_read));
mysql-li_read = 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/mysqli mysqli.c mysqli_api.c
tony2001Tue Oct 16 13:20:14 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c mysqli_api.c
Log:
avoid double free and use zval_dtor() where neccessary
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.3r2=1.72.2.16.2.17.2.4diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.3
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.4
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.3 Sun Oct 7 05:22:05 2007
+++ php-src/ext/mysqli/mysqli.c Tue Oct 16 13:20:14 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.3 2007/10/07 05:22:05 davidw Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.4 2007/10/16 13:20:14 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -202,8 +202,7 @@
mysql-hash_key = NULL;
}
if (mysql-li_read) {
- efree(Z_STRVAL_P(mysql-li_read));
- FREE_ZVAL(mysql-li_read);
+ zval_dtor(mysql-li_read);
mysql-li_read = NULL;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.3r2=1.118.2.22.2.16.2.4diff_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.3
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.4
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.3 Sun Oct 7 08:30:47 2007
+++ php-src/ext/mysqli/mysqli_api.c Tue Oct 16 13:20:14 2007
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.3 2007/10/07 08:30:47 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.4 2007/10/16 13:20:14 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1336,7 +1336,6 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link,
MYSQLI_STATUS_VALID);
if (mysql-li_read) {
- efree(Z_STRVAL_P(mysql-li_read));
zval_dtor(mysql-li_read);
mysql-li_read = 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/mysqli mysqli.c /ext/mysqlnd mysqlnd_priv.h
andrey Tue Oct 16 20:56:22 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqlndmysqlnd_priv.h
Log:
Sync mysqlnd. Should still compile with 5_2 for those who want to use the
current stable branch. mysqli from 5_3 patched for mysqlnd should be also
compilable with 5_2.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.4r2=1.72.2.16.2.17.2.5diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.4
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.4 Tue Oct 16 13:20:14 2007
+++ php-src/ext/mysqli/mysqli.c Tue Oct 16 20:56:22 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.4 2007/10/16 13:20:14 tony2001 Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.5 2007/10/16 20:56:22 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -315,6 +315,14 @@
}
/* }}} */
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz) (++(pz)-refcount)
+#define Z_REFCOUNT_P(pz) ((pz)-refcount)
+#define Z_SET_REFCOUNT_P(pz, rc) ((pz)-refcount = rc)
+#endif
+
+
/* {{{ mysqli_read_property */
zval *mysqli_read_property(zval *object, zval *member, int type TSRMLS_DC)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_priv.h?r1=1.4.2.2r2=1.4.2.3diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_priv.h
diff -u php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.2
php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.3
--- php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.2 Fri Oct 5 21:23:56 2007
+++ php-src/ext/mysqlnd/mysqlnd_priv.h Tue Oct 16 20:56:22 2007
@@ -18,11 +18,21 @@
+--+
*/
-/* $Id: mysqlnd_priv.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.4.2.3 2007/10/16 20:56:22 andrey Exp $ */
#ifndef MYSQLND_PRIV_H
#define MYSQLND_PRIV_H
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz) (++(pz)-refcount)
+#define Z_DELREF_P(pz) (--(pz)-refcount)
+#define Z_REFCOUNT_P(pz) ((pz)-refcount)
+#define Z_SET_REFCOUNT_P(pz, rc) ((pz)-refcount = rc)
+#define Z_REFCOUNT_PP(ppz) Z_REFCOUNT_P(*(ppz))
+#define Z_DELREF_PP(ppz) Z_DELREF_P(*(ppz))
+#endif
+
#ifdef ZTS
#include TSRM.h
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
