Merge branch 'develop' into 1.2.1-binlog_router_trx

2015-08-26 18:02:49 +02:00
parent 54ee264daf d9bd22ce90
commit b37489e6fd
1 changed files with 1 additions and 1 deletions
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@ -2981,7 +2981,7 @@ static void* thr_filewriter_fun(
                                               != 0);
                                        node = node->mlnode_next;
                                        vn2 = bb_list->mlist_versno;
-                                } while (vn1 != vn2);
+                                } while (vn1 != vn2 && node);
                    
                        } /* while (node != NULL) */