andrey Mon Feb 11 16:45:15 2008 UTC Modified files: /php-src/ext/mysqli mysqli.c /php-src/ext/mysqlnd mysqlnd.c mysqlnd.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.117&r2=1.118&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.117 php-src/ext/mysqli/mysqli.c:1.118 --- php-src/ext/mysqli/mysqli.c:1.117 Wed Feb 6 11:35:44 2008 +++ php-src/ext/mysqli/mysqli.c Mon Feb 11 16:45:15 2008 @@ -17,7 +17,7 @@ | Ulf Wendel <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.117 2008/02/06 11:35:44 andrey Exp $ + $Id: mysqli.c,v 1.118 2008/02/11 16:45:15 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -722,6 +722,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 < 60000) || (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); @@ -770,6 +777,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.c?r1=1.17&r2=1.18&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd.c diff -u php-src/ext/mysqlnd/mysqlnd.c:1.17 php-src/ext/mysqlnd/mysqlnd.c:1.18 --- php-src/ext/mysqlnd/mysqlnd.c:1.17 Mon Feb 4 17:55:51 2008 +++ php-src/ext/mysqlnd/mysqlnd.c Mon Feb 11 16:45:15 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd.c,v 1.17 2008/02/04 17:55:51 andrey Exp $ */ +/* $Id: mysqlnd.c,v 1.18 2008/02/11 16:45:15 andrey Exp $ */ #include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" @@ -28,6 +28,8 @@ #include "mysqlnd_charset.h" #include "mysqlnd_debug.h" #include "mysqlnd_block_alloc.h" +/* for php_get_current_user() */ +#include "ext/standard/basic_functions.h" /* the server doesn't support 4byte utf8, but let's make it forward compatible */ #define MYSQLND_MAX_ALLOWED_USER_LEN 256 /* 64 char * 4byte */ http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd.h diff -u php-src/ext/mysqlnd/mysqlnd.h:1.10 php-src/ext/mysqlnd/mysqlnd.h:1.11 --- php-src/ext/mysqlnd/mysqlnd.h:1.10 Tue Jan 29 18:13:12 2008 +++ php-src/ext/mysqlnd/mysqlnd.h Mon Feb 11 16:45:15 2008 @@ -18,12 +18,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd.h,v 1.10 2008/01/29 18:13:12 andrey Exp $ */ +/* $Id: mysqlnd.h,v 1.11 2008/02/11 16:45:15 andrey Exp $ */ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.3-dev - 080129 - $Revision: 1.10 $" +#define MYSQLND_VERSION "mysqlnd 5.0.3-dev - 080129 - $Revision: 1.11 $" #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.3&r2=1.4&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_debug.c diff -u php-src/ext/mysqlnd/mysqlnd_debug.c:1.3 php-src/ext/mysqlnd/mysqlnd_debug.c:1.4 --- php-src/ext/mysqlnd/mysqlnd_debug.c:1.3 Mon Dec 31 07:12:12 2007 +++ php-src/ext/mysqlnd/mysqlnd_debug.c Mon Feb 11 16:45:15 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_debug.c,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */ +/* $Id: mysqlnd_debug.c,v 1.4 2008/02/11 16:45:15 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; while (i < mode_len) { - if (mode[i++] == ':') { + if (mode[i] == ':') { break; } + i++; } } state = PARSER_WAIT_COLON; http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.h?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_debug.h diff -u php-src/ext/mysqlnd/mysqlnd_debug.h:1.4 php-src/ext/mysqlnd/mysqlnd_debug.h:1.5 --- php-src/ext/mysqlnd/mysqlnd_debug.h:1.4 Mon Dec 31 07:12:12 2007 +++ php-src/ext/mysqlnd/mysqlnd_debug.h Mon Feb 11 16:45:15 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_debug.h,v 1.4 2007/12/31 07:12:12 sebastian Exp $ */ +/* $Id: mysqlnd_debug.h,v 1.5 2008/02/11 16:45:15 andrey Exp $ */ #ifndef MYSQLND_DEBUG_H #define MYSQLND_DEBUG_H @@ -78,7 +78,8 @@ char * mysqlnd_get_backtrace(TSRMLS_D); -#if PHP_DEBUG && !defined(PHP_WIN32) +#if MYSQLND_DBG_ENABLED == 1 + #define DBG_INF(msg) do { if (dbg_skip_trace == FALSE) MYSQLND_G(dbg)->m->log(MYSQLND_G(dbg), __LINE__, __FILE__, -1, "info : ", (msg)); } while (0) #define DBG_ERR(msg) do { if (dbg_skip_trace == FALSE) MYSQLND_G(dbg)->m->log(MYSQLND_G(dbg), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0) #define DBG_INF_FMT(...) do { if (dbg_skip_trace == FALSE) MYSQLND_G(dbg)->m->log_va(MYSQLND_G(dbg), __LINE__, __FILE__, -1, "info : ", __VA_ARGS__); } while (0) @@ -90,7 +91,9 @@ -#else +#elif MYSQLND_DBG_ENABLED == 0 + + static inline void DBG_INF(char *msg) {} static inline void DBG_ERR(char *msg) {} static inline void DBG_INF_FMT(char *format, ...) {} http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_enum_n_def.h?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_enum_n_def.h diff -u php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.4 php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.5 --- php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.4 Mon Jan 28 18:27:49 2008 +++ php-src/ext/mysqlnd/mysqlnd_enum_n_def.h Mon Feb 11 16:45:15 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_enum_n_def.h,v 1.4 2008/01/28 18:27:49 andrey Exp $ */ +/* $Id: mysqlnd_enum_n_def.h,v 1.5 2008/02/11 16:45:15 andrey Exp $ */ #ifndef MYSQLND_ENUM_N_DEF_H #define MYSQLND_ENUM_N_DEF_H @@ -210,6 +210,7 @@ #define TIMESTAMP_FLAG 1024 #define SET_FLAG 2048 #define NO_DEFAULT_VALUE_FLAG 4096 +#define ON_UPDATE_NOW_FLAG 8192 #define PART_KEY_FLAG 16384 #define GROUP_FLAG 32768 #define NUM_FLAG 32768 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_structs.h?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_structs.h diff -u php-src/ext/mysqlnd/mysqlnd_structs.h:1.10 php-src/ext/mysqlnd/mysqlnd_structs.h:1.11 --- php-src/ext/mysqlnd/mysqlnd_structs.h:1.10 Tue Jan 29 22:06:16 2008 +++ php-src/ext/mysqlnd/mysqlnd_structs.h Mon Feb 11 16:45:15 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_structs.h,v 1.10 2008/01/29 22:06:16 rrichards Exp $ */ +/* $Id: mysqlnd_structs.h,v 1.11 2008/02/11 16:45:15 andrey Exp $ */ #ifndef MYSQLND_STRUCTS_H #define MYSQLND_STRUCTS_H @@ -399,9 +399,6 @@ unsigned long client_flag; unsigned long server_capabilities; - int tmp_int; - - /* For UPSERT queries */ mysqlnd_upsert_status upsert_status; char *last_message;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php