Bug#21485997: WRONG INSTRUMENTATION OF CLASS GTID_SET

Sujatha Sivakumar · Sujatha Sivakumar · commit 06df126a112a · 2015-09-08T10:47:20.000+05:30
Fixing a build issue found on weekend runs with
'noperfschema' option.
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -154,7 +154,7 @@ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 ADD_COMPILE_FLAGS(
   mysqlbinlog.cc
-  COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/sql" "-DHAVE_REPLICATION"
+  COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/sql" "-DHAVE_REPLICATION" "-DDISABLE_PSI_MUTEX"
 )
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient binlogevents_static)
 
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
@@ -30,7 +30,6 @@
 
 #define MYSQL_CLIENT
 #undef MYSQL_SERVER
-#define DISABLE_PSI_MUTEX
 #include "client_priv.h"
 #include "my_default.h"
 #include <my_time.h>

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)`
`154`	`154`	`MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)`
`155`	`155`	`ADD_COMPILE_FLAGS(`
`156`	`156`	`mysqlbinlog.cc`
`157`		`- COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/sql" "-DHAVE_REPLICATION"`
	`157`	`+ COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/sql" "-DHAVE_REPLICATION" "-DDISABLE_PSI_MUTEX"`
`158`	`158`	`)`
`159`	`159`	`TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient binlogevents_static)`
`160`	`160`