Merge branch 'mysql-5.7' into mysql-trunk

mysql · Nov 28, 2016 · ac2d8ba · ac2d8ba
2 parents 155e322 + 43b3a71
commit ac2d8ba
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 65 deletions.
diff --git a/rapid/plugin/x/ngs/include/ngs/thread.h b/rapid/plugin/x/ngs/include/ngs/thread.h
@@ -23,9 +23,6 @@
 #ifdef NGS_STANDALONE
 # include <pthread.h>
 #else
-# if  !defined(MYSQL_DYNAMIC_PLUGIN) && defined(_WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-#   define MYSQL_DYNAMIC_PLUGIN 1
-# endif
 # include <my_thread.h>
 # include <thr_mutex.h>
 # include <thr_cond.h>

diff --git a/rapid/plugin/x/ngs/ngs_common/connection_vio.cc b/rapid/plugin/x/ngs/ngs_common/connection_vio.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "ngs_common/connection_vio.h"
 #include "ngs_common/connection_type.h"
 #include "ngs_common/options_ssl.h"

diff --git a/rapid/plugin/x/ngs/ngs_common/operations_factory.cc b/rapid/plugin/x/ngs/ngs_common/operations_factory.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "ngs_common/operations_factory.h"
 #include "ngs/memory.h"
 

diff --git a/rapid/plugin/x/ngs/src/client.cc b/rapid/plugin/x/ngs/src/client.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "ngs/client.h"
 #include "ngs/scheduler.h"
 #include "ngs/interface/server_interface.h"

diff --git a/rapid/plugin/x/ngs/src/client_session.cc b/rapid/plugin/x/ngs/src/client_session.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "ngs/client_session.h"
 #include "ngs/interface/client_interface.h"
 #include "ngs/interface/server_interface.h"

diff --git a/rapid/plugin/x/ngs/src/scheduler.cc b/rapid/plugin/x/ngs/src/scheduler.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "my_psi_config.h"
 #include "my_rdtsc.h"
 #include "ngs/log.h"

diff --git a/rapid/plugin/x/ngs/src/server.cc b/rapid/plugin/x/ngs/src/server.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "ngs/server.h"
 #include "ngs/interface/client_interface.h"
 #include "ngs/interface/connection_acceptor_interface.h"

diff --git a/rapid/plugin/x/ngs/src/server_acceptors.cc b/rapid/plugin/x/ngs/src/server_acceptors.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "ngs/server_acceptors.h"
 #include "ngs_common/connection_vio.h"
 #include "ngs_common/bind.h"

diff --git a/rapid/plugin/x/ngs/src/thread.cc b/rapid/plugin/x/ngs/src/thread.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "ngs/thread.h"
 #include "ngs/memory.h"
 #include "my_thread.h"

diff --git a/rapid/plugin/x/src/admin_cmd_handler.cc b/rapid/plugin/x/src/admin_cmd_handler.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "admin_cmd_handler.h"
 #include "xpl_error.h"
 #include "sql_data_context.h"

diff --git a/rapid/plugin/x/src/mysql_variables.cc b/rapid/plugin/x/src/mysql_variables.cc
@@ -17,10 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif
-
 #include "mysql_variables.h"
 #include <mysql/plugin.h>
 #include "mysqld.h"

diff --git a/rapid/plugin/x/src/xpl_performance_schema.cc b/rapid/plugin/x/src/xpl_performance_schema.cc
@@ -17,11 +17,6 @@
 * 02110-1301  USA
 */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "xpl_performance_schema.h"
 #include "ngs/memory.h"
 

diff --git a/rapid/plugin/x/src/xpl_plugin.cc b/rapid/plugin/x/src/xpl_plugin.cc
@@ -15,9 +15,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif
 #include <my_config.h>
 #include <mysql/plugin.h>
 #include <mysql_version.h>

diff --git a/rapid/plugin/x/src/xpl_server.cc b/rapid/plugin/x/src/xpl_server.cc
@@ -17,11 +17,6 @@
  * 02110-1301  USA
  */
 
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && defined(WIN32) && !defined(XPLUGIN_UNIT_TESTS)
-// Needed for importing PERFORMANCE_SCHEMA plugin API.
-#define MYSQL_DYNAMIC_PLUGIN 1
-#endif // WIN32
-
 #include "xpl_server.h"
 #include "xpl_client.h"
 #include "xpl_session.h"