Merge branch 'mysql-5.6' into mysql-5.7

harinvadodaria · harinvadodaria · commit 2b5d76073493 · 2016-12-16T17:21:36.000+05:30
diff --git a/plugin/connection_control/CMakeLists.txt b/plugin/connection_control/CMakeLists.txt
@@ -18,6 +18,5 @@ MYSQL_ADD_PLUGIN(connection_control
 		 connection_control.cc
 		 security_context_wrapper.cc
 		 connection_delay.cc
-		 LINK_LIBRARIES mysys
 		 MODULE_ONLY)
 
