From 3a9fe080eedb0fa7c3eaf11f6b2c5947a63fd18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesmar=20Canna=C3=B2?= Date: Sun, 8 Feb 2015 12:04:24 +0100 Subject: [PATCH] FIX ISSUE #174:: Print "DEBUG" in print_version() if compiled with DEBUG option : all modules --- lib/Standard_MySQL_Authentication.cpp | 7 ++++++- lib/Standard_MySQL_Thread.cpp | 7 ++++++- lib/Standard_ProxySQL_Admin.cpp | 8 ++++++-- lib/Standard_Query_Cache.cpp | 7 ++++++- lib/Standard_Query_Processor.cpp | 7 ++++++- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/lib/Standard_MySQL_Authentication.cpp b/lib/Standard_MySQL_Authentication.cpp index 532652065..f066979ad 100644 --- a/lib/Standard_MySQL_Authentication.cpp +++ b/lib/Standard_MySQL_Authentication.cpp @@ -14,7 +14,12 @@ typedef struct _account_details_t { bool transaction_persistent; } account_details_t; -#define MYSQL_AUTHENTICATION_VERSION "0.1.0706" +#ifdef DEBUG +#define DEB "_DEBUG" +#else +#define DEB "" +#endif /* DEBUG */ +#define MYSQL_AUTHENTICATION_VERSION "0.1.0706" DEB //#define MY_SEPERATOR_HASH "__uy1gf2doi3ujh4ge5__" diff --git a/lib/Standard_MySQL_Thread.cpp b/lib/Standard_MySQL_Thread.cpp index 62a8d8925..a9fffcdde 100644 --- a/lib/Standard_MySQL_Thread.cpp +++ b/lib/Standard_MySQL_Thread.cpp @@ -16,7 +16,12 @@ extern "C" { #endif /* __cplusplus */ -#define MYSQL_THREAD_VERSION "0.1.1114" +#ifdef DEBUG +#define DEB "_DEBUG" +#else +#define DEB "" +#endif /* DEBUG */ +#define MYSQL_THREAD_VERSION "0.1.1114" DEB #define DEFAULT_NUM_THREADS 4 diff --git a/lib/Standard_ProxySQL_Admin.cpp b/lib/Standard_ProxySQL_Admin.cpp index d8c7e9f3a..f87145542 100644 --- a/lib/Standard_ProxySQL_Admin.cpp +++ b/lib/Standard_ProxySQL_Admin.cpp @@ -1293,8 +1293,12 @@ __end_while_pool: return NULL; } - -#define PROXYSQL_ADMIN_VERSION "0.1.0815" +#ifdef DEBUG +#define DEB "_DEBUG" +#else +#define DEB "" +#endif /* DEBUG */ +#define PROXYSQL_ADMIN_VERSION "0.1.0815" DEB //class Standard_ProxySQL_Admin: public ProxySQL_Admin { /* diff --git a/lib/Standard_Query_Cache.cpp b/lib/Standard_Query_Cache.cpp index 124093e07..3f1d3025d 100644 --- a/lib/Standard_Query_Cache.cpp +++ b/lib/Standard_Query_Cache.cpp @@ -29,7 +29,12 @@ } while(0) -#define QUERY_CACHE_VERSION "0.1.0629" +#ifdef DEBUG +#define DEB "_DEBUG" +#else +#define DEB "" +#endif /* DEBUG */ +#define QUERY_CACHE_VERSION "0.1.0629" DEB __thread uint64_t __thr_cntSet=0; __thread uint64_t __thr_cntGet=0; diff --git a/lib/Standard_Query_Processor.cpp b/lib/Standard_Query_Processor.cpp index ce8718f38..feb085719 100644 --- a/lib/Standard_Query_Processor.cpp +++ b/lib/Standard_Query_Processor.cpp @@ -9,7 +9,12 @@ #include "../deps/libinjection/libinjection_sqli.h" -#define QUERY_PROCESSOR_VERSION "0.1.728" +#ifdef DEBUG +#define DEB "_DEBUG" +#else +#define DEB "" +#endif /* DEBUG */ +#define QUERY_PROCESSOR_VERSION "0.1.728" DEB #define strdup_null(__c) ( __c ? strdup(__c) : __c )