From b38324acb6de3e667b8697059cb7b2423c154188 Mon Sep 17 00:00:00 2001 From: VilhoRaatikka Date: Wed, 1 Oct 2014 14:12:26 +0300 Subject: [PATCH 1/2] Fix to bug #514, http://bugs.mariadb.com/show_bug.cgi?id=514 Excluded unused functions from build with #if defined(NOT_USED) .. #endif macros --- utils/skygw_utils.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/skygw_utils.cc b/utils/skygw_utils.cc index 30b7ae8a9..0144d4519 100644 --- a/utils/skygw_utils.cc +++ b/utils/skygw_utils.cc @@ -119,15 +119,16 @@ static void slist_add_node( slist_t* list, slist_node_t* node); +#if defined(NOT_USED) static slist_node_t* slist_node_get_next( slist_node_t* curr_node); static slist_node_t* slist_get_first( slist_t* list); - static slist_cursor_t* slist_get_cursor( slist_t* list); - +#endif /*< NOT_USED */ + static bool file_write_header(skygw_file_t* file); static void simple_mutex_free_memory(simple_mutex_t* sm); static void mlist_free_memory(mlist_t* ml, char* name); @@ -740,7 +741,7 @@ static void slist_add_node( } - +#if defined(NOT_USED) static slist_node_t* slist_node_get_next( slist_node_t* curr_node) { @@ -766,7 +767,6 @@ static slist_node_t* slist_get_first( return NULL; } - static slist_cursor_t* slist_get_cursor( slist_t* list) { @@ -777,7 +777,7 @@ static slist_cursor_t* slist_get_cursor( c = slist_cursor_init(list); return c; } - +#endif /*< NOT_USED */ static slist_cursor_t* slist_cursor_init( slist_t* list) From a53e80e14499d929ed6e6f4351dc57eef45e3851 Mon Sep 17 00:00:00 2001 From: VilhoRaatikka Date: Wed, 1 Oct 2014 14:30:59 +0300 Subject: [PATCH 2/2] Added back removal of double newline character from log records. --- log_manager/log_manager.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc index 9dc2a0f87..9c7bbc327 100644 --- a/log_manager/log_manager.cc +++ b/log_manager/log_manager.cc @@ -755,7 +755,12 @@ static int logmanager_write_log( break; } } - wp[safe_str_len-1] = '\n'; + /** remove double line feed */ + if (wp[safe_str_len-2] == '\n') + { + wp[safe_str_len-2]=' '; + } + wp[safe_str_len-1] = '\n'; blockbuf_unregister(bb); /**