Author: ahristov
Date: 2008-02-11 17:12:07 +0100 (Mon, 11 Feb 2008)
New Revision: 1270
Modified:
trunk/mysqlnd/mysqlnd.h
trunk/mysqlnd/mysqlnd_debug.h
trunk/php5/ext/mysqli/mysqli.c
trunk/php5/ext/mysqli/mysqli_fe.c
trunk/php5/ext/mysqli/php_mysqli_structs.h
trunk/php6/ext/mysqli/mysqli.c
trunk/php6/ext/mysqli/php_mysqli_structs.h
Log:
Fix libmysql build and add a new constant to be used by the test
cases MYSQLI_DEBUG_TRACE_ENABLED
Modified: trunk/mysqlnd/mysqlnd.h
===================================================================
--- trunk/mysqlnd/mysqlnd.h 2008-02-11 16:00:08 UTC (rev 1269)
+++ trunk/mysqlnd/mysqlnd.h 2008-02-11 16:12:07 UTC (rev 1270)
@@ -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
Modified: trunk/mysqlnd/mysqlnd_debug.h
===================================================================
--- trunk/mysqlnd/mysqlnd_debug.h 2008-02-11 16:00:08 UTC (rev 1269)
+++ trunk/mysqlnd/mysqlnd_debug.h 2008-02-11 16:12:07 UTC (rev 1270)
@@ -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, ...) {}
Modified: trunk/php5/ext/mysqli/mysqli.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli.c 2008-02-11 16:00:08 UTC (rev 1269)
+++ trunk/php5/ext/mysqli/mysqli.c 2008-02-11 16:12:07 UTC (rev 1270)
@@ -783,6 +783,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;
}
/* }}} */
Modified: trunk/php5/ext/mysqli/mysqli_fe.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli_fe.c 2008-02-11 16:00:08 UTC (rev 1269)
+++ trunk/php5/ext/mysqli/mysqli_fe.c 2008-02-11 16:12:07 UTC (rev 1270)
@@ -221,7 +221,9 @@
PHP_FALIAS(options,mysqli_options,NULL)
PHP_FALIAS(ping,mysqli_ping,NULL)
PHP_FALIAS(prepare,mysqli_prepare,NULL)
+#if defined(HAVE_MYSQLND)
PHP_FALIAS(reap_async_query,mysqli_reap_async_query,NULL)
+#endif
PHP_FALIAS(query,mysqli_query,NULL)
PHP_FALIAS(real_connect,mysqli_real_connect,NULL)
PHP_FALIAS(real_escape_string,mysqli_real_escape_string,NULL)
Modified: trunk/php5/ext/mysqli/php_mysqli_structs.h
===================================================================
--- trunk/php5/ext/mysqli/php_mysqli_structs.h 2008-02-11 16:00:08 UTC (rev 1269)
+++ trunk/php5/ext/mysqli/php_mysqli_structs.h 2008-02-11 16:12:07 UTC (rev 1270)
@@ -306,6 +306,9 @@
#define MYSQLI_BG_STORE_RESULT 4
#endif
#define MYSQLI_ASYNC 8
+#else
+/* libmysql */
+#define MYSQLI_ASYNC 0
#endif
/* for mysqli_fetch_assoc */
Modified: trunk/php6/ext/mysqli/mysqli.c
===================================================================
--- trunk/php6/ext/mysqli/mysqli.c 2008-02-11 16:00:08 UTC (rev 1269)
+++ trunk/php6/ext/mysqli/mysqli.c 2008-02-11 16:12:07 UTC (rev 1270)
@@ -780,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;
}
/* }}} */
Modified: trunk/php6/ext/mysqli/php_mysqli_structs.h
===================================================================
--- trunk/php6/ext/mysqli/php_mysqli_structs.h 2008-02-11 16:00:08 UTC (rev 1269)
+++ trunk/php6/ext/mysqli/php_mysqli_structs.h 2008-02-11 16:12:07 UTC (rev 1270)
@@ -319,6 +319,9 @@
#define MYSQLI_BG_STORE_RESULT 4
#endif
#define MYSQLI_ASYNC 8
+#else
+/* libmysql */
+#define MYSQLI_ASYNC 0
#endif
| Thread |
|---|
| • PHP mysqlnd svn commit: r1270 - in trunk: mysqlnd php5/ext/mysqli php6/ext/mysqli | ahristov | 11 Feb |
