Fix memory leak in XtraDB.

MariaDB · Jun 27, 2016 · f629f53 · f629f53
1 parent 94a6183
commit f629f53
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);
 	}