[Commits] 34ed6ce: Fix double free of srv_sys and fix test case failure.

Jan Lindström jan.lindstrom at mariadb.com
Wed Sep 7 13:57:10 EEST 2016


revision-id: 34ed6ce9b467ea3650d2dd30b9ea5e03753d386d (mariadb-10.2.1-10-g34ed6ce)
parent(s): 515fb3a9988ad852901ab421d177b13bac4e35da
committer: Jan Lindström
timestamp: 2016-09-07 13:56:54 +0300
message:

Fix double free of srv_sys and fix test case failure.

---
 mysql-test/suite/galera/r/create.result | 4 ++++
 storage/innobase/srv/srv0srv.cc         | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/galera/r/create.result b/mysql-test/suite/galera/r/create.result
index b93cd7b..4d6488d 100644
--- a/mysql-test/suite/galera/r/create.result
+++ b/mysql-test/suite/galera/r/create.result
@@ -76,13 +76,17 @@ DROP TABLE t1, t2;
 # MDEV-10235: Deadlock in CREATE TABLE ... AS SELECT .. if result set
 # is empty in Galera
 #
+connection node_1;
 CREATE TABLE t1(c1 INT) ENGINE=INNODB;
 INSERT INTO t1 VALUES(1);
 CREATE TABLE t2 AS SELECT * FROM t1 WHERE c1=2;
+connection node_2;
 SELECT * FROM t1;
 c1
 1
 SELECT * FROM t2;
 c1
 DROP TABLE t1, t2;
+disconnect node_2;
+disconnect node_1;
 # End of tests
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index 1ba3eab..f738bca 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -1142,8 +1142,6 @@ srv_free(void)
 
 	os_event_destroy(srv_buf_resize_event);
 
-	ut_free(srv_sys);
-
 #ifdef UNIV_DEBUG
 	os_event_destroy(srv_master_thread_disabled_event);
 	srv_master_thread_disabled_event = NULL;


More information about the commits mailing list