Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop

2014-10-01 14:38:15 +03:00
parent b0683d9b4d a53e80e144
commit 856448500e
2 changed files with 11 additions and 6 deletions
--- 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);

                /**