From f629f5354850728d85d6b915d2a3fe7192f00cd5 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Mon, 27 Jun 2016 14:44:07 -0400 Subject: [PATCH] Fix memory leak in XtraDB. --- mysql-test/suite/galera/suite.pm | 1 - mysql-test/suite/wsrep/suite.pm | 1 - storage/xtradb/srv/srv0srv.cc | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm index 8a25434f2e9..d6cd4273014 100644 --- a/mysql-test/suite/galera/suite.pm +++ b/mysql-test/suite/galera/suite.pm @@ -68,7 +68,6 @@ push @::global_suppressions, qr|WSREP: gcs_caused\(\) returned .*|, qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|, qr(WSREP: Action message in non-primary configuration from member [0-9]*), - qr(InnoDB: Some resources were not cleaned up in shutdown.*), ); diff --git a/mysql-test/suite/wsrep/suite.pm b/mysql-test/suite/wsrep/suite.pm index a1b5fddc628..31d9faeb0dd 100644 --- a/mysql-test/suite/wsrep/suite.pm +++ b/mysql-test/suite/wsrep/suite.pm @@ -29,7 +29,6 @@ push @::global_suppressions, qr(WSREP: option --wsrep-causal-reads is deprecated), qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0), qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|, - qr(InnoDB: Some resources were not cleaned up in shutdown.*), ); $ENV{PATH}="$epath:$ENV{PATH}"; diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc index ed7ef96cfe5..73fc93f9597 100644 --- a/storage/xtradb/srv/srv0srv.cc +++ b/storage/xtradb/srv/srv0srv.cc @@ -1209,6 +1209,9 @@ srv_free(void) os_event_free(srv_buf_dump_event); os_event_free(srv_checkpoint_completed_event); os_event_free(srv_redo_log_tracked_event); +#ifdef WITH_INNODB_DISALLOW_WRITES + os_event_free(srv_allow_writes_event); +#endif /* WITH_INNODB_DISALLOW_WRITES */ mutex_free(&srv_sys->mutex); mutex_free(&srv_sys->tasks_mutex); }