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.11&r2=1.72.2.16.2.17.2.12&diff_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.8&r2=1.3.2.9&diff_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.4&r2=1.1.2.5&diff_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] == ',')
