From b86d3f3dfd9c916bd1427a9f6879a42544de0d8c Mon Sep 17 00:00:00 2001
From: vraatikka <vilho.raatikka@skysql.com>
Date: Mon, 2 Sep 2013 10:30:50 +0300
Subject: [PATCH] Holding error log's block buffer registration until all logs
 were written caused deadlock if block buffers were full. Now buffer
 registrations don't overlap.

---
 log_manager/log_manager.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 914993350..0e9213d7e 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -584,6 +584,7 @@ static int logmanager_write_log(
                     wp[timestamp_len-1+str_len-2]=' ';
             }
             wp[timestamp_len-1+str_len-1]='\n';
+            blockbuf_unregister(bb);
 
             if (spread_down) {
                     /**
@@ -630,7 +631,6 @@ static int logmanager_write_log(
                             blockbuf_unregister(bb_c);
                     }
             } /* if (spread_down) */
-            blockbuf_unregister(bb);
         }
         
 return_err: