com php-src: compile out example plugin in a release build: ext/mysqlnd/mysqlnd_auth.c ext/mysqlnd/mysqlnd_driver .c ext/mysqlnd/mysqlnd_plugin.c
| From: | Andrey Hristov | Date: | Wed, 26 Sep 2012 15:13:46 +0000 |
| Subject: | com php-src: compile out example plugin in a release build: ext/mysqlnd/mysqlnd_auth.c ext/mysqlnd/mysqlnd_driver .c ext/mysqlnd/mysqlnd_plugin.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70240@lists.php.net to get a copy of this message | ||
Commit: da96aa848fc4845399d4d7a7c396fa31ffb9ffba
Author: andrey <andrey@php.net> Wed, 26 Sep 2012 17:13:46 +0200
Parents: 263b37bee1ea92e30791b15af710b509da4b8ca8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da96aa848fc4845399d4d7a7c396fa31ffb9ffba
Log:
compile out example plugin in a release build
Changed paths:
M ext/mysqlnd/mysqlnd_auth.c
M ext/mysqlnd/mysqlnd_driver.c
M ext/mysqlnd/mysqlnd_plugin.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
index ce03be4..72b2532 100644
--- a/ext/mysqlnd/mysqlnd_auth.c
+++ b/ext/mysqlnd/mysqlnd_auth.c
@@ -558,7 +558,7 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn,
}
php_stream_free(stream, PHP_STREAM_FREE_CLOSE);
}
- DBG_RETURN(ret)
+ DBG_RETURN(ret);
}
/* }}} */
diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c
index e55a0bc..93f3d3f 100644
--- a/ext/mysqlnd/mysqlnd_driver.c
+++ b/ext/mysqlnd/mysqlnd_driver.c
@@ -81,7 +81,9 @@ PHPAPI void mysqlnd_library_init(TSRMLS_D)
mysqlnd_plugin_core.plugin_header.plugin_stats.values = mysqlnd_global_stats;
mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_plugin_core
TSRMLS_CC);
}
+#if defined(MYSQLND_DBG_ENABLED) && MYSQLND_DBG_ENABLED == 1
mysqlnd_example_plugin_register(TSRMLS_C);
+#endif
mysqlnd_debug_trace_plugin_register(TSRMLS_C);
mysqlnd_register_builtin_authentication_plugins(TSRMLS_C);
diff --git a/ext/mysqlnd/mysqlnd_plugin.c b/ext/mysqlnd/mysqlnd_plugin.c
index 2dbb57d..61ab197 100644
--- a/ext/mysqlnd/mysqlnd_plugin.c
+++ b/ext/mysqlnd/mysqlnd_plugin..c
@@ -26,7 +26,7 @@
#include "mysqlnd_debug.h"
/*--------------------------------------------------------------------*/
-
+#if defined(MYSQLND_DBG_ENABLED) && MYSQLND_DBG_ENABLED == 1
static enum_func_status mysqlnd_example_plugin_end(void * p TSRMLS_DC);
static MYSQLND_STATS * mysqlnd_plugin_example_stats = NULL;
@@ -87,7 +87,7 @@ mysqlnd_example_plugin_register(TSRMLS_D)
mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_example_plugin
TSRMLS_CC);
}
/* }}} */
-
+#endif /* defined(MYSQLND_DBG_ENABLED) && MYSQLND_DBG_ENABLED == 1 */
/*--------------------------------------------------------------------*/
static HashTable mysqlnd_registered_plugins;