summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorVenkatesh Duggirala <venkatesh.duggirala@oracle.com>2013-03-15 08:56:20 +0530
committerVenkatesh Duggirala <venkatesh.duggirala@oracle.com>2013-03-15 08:56:20 +0530
commitcc5876d2d2b4105d3f0cab8be1f09a67667bf8fd (patch)
tree422695fb8c8f095f5e867dac22fc1963f525b14b /sql
parent6077a41a66607e4b7da3fc5088d12ad1731c45c7 (diff)
downloadmariadb-git-cc5876d2d2b4105d3f0cab8be1f09a67667bf8fd.tar.gz
Bug#16056813-MEMORY LEAK ON FILTERED SLAVE
Back porting fix from mysql-5.5 sql/rpl_utility.cc: Resetting last_added to NULL to avoid memory leak
Diffstat (limited to 'sql')
-rw-r--r--sql/rpl_utility.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc
index d8c975fba90..23dc09793e4 100644
--- a/sql/rpl_utility.cc
+++ b/sql/rpl_utility.cc
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -280,6 +280,7 @@ void Deferred_log_events::rewind()
Log_event *ev= *(Log_event **) dynamic_array_ptr(&array, i);
delete ev;
}
+ last_added= NULL;
if (array.elements > array.max_element)
freeze_size(&array);
reset_dynamic(&array);