Various xplugin fixes

- Fix for crash in connection accept code Was missing a mutex in timer for X connection timeout - Updated tests that print version numbers so that they don't get printed and break diffs - Fixed some warnings in Windows - Removed outdated/obsolete documentation for plugin - Fix for protobuf memleak (cherry picked from commit c82f0aa9454ff7799371567c9a6ee5f223383e8c) Conflicts:	rapid/plugin/x/protocol/conf.py

Author: akojima

extra/protobuf/CMakeLists.txt

@@ -26,6 +26,8 @@
 # protobuf-2.6.0/m4/
 # protobuf-2.6.0/vsprojects/
 
+SET(PROTOBUF_MSVC_DISABLED_WARNINGS "/wd4018 /wd4005 /wd4244 /wd4267 /wd4065")
+
 # Turn off some warning flags when compiling protobuf
 MY_CHECK_CXX_COMPILER_FLAG("-Wno-sign-compare" HAVE_NO_SIGN_COMPARE)
 IF(HAVE_NO_SIGN_COMPARE)
@@ -95,6 +97,11 @@ SET(LIBPROTOBUF_LITE_SOURCES
  ${PROTO_SRC_DIR}/google/protobuf/io/zero_copy_stream.cc
  ${PROTO_SRC_DIR}/google/protobuf/io/zero_copy_stream_impl_lite.cc
 )
+
+IF(MSVC)
+ ADD_COMPILE_FLAGS(${LIBPROTOBUF_LITE_SOURCES} COMPILE_FLAGS ${PROTOBUF_MSVC_DISABLED_WARNINGS})
+ENDIF(MSVC)
+
 ADD_CONVENIENCE_LIBRARY(protobuf-lite ${LIBPROTOBUF_LITE_SOURCES})
 SET_PROPERTY(TARGET protobuf-lite PROPERTY EXCLUDE_FROM_ALL TRUE)
 
@@ -125,6 +132,11 @@ SET(LIBPROTOBUF_SOURCES
  ${PROTO_SRC_DIR}/google/protobuf/compiler/importer.cc
  ${PROTO_SRC_DIR}/google/protobuf/compiler/parser.cc
 )
+
+IF(MSVC)
+ ADD_COMPILE_FLAGS(${LIBPROTOBUF_SOURCES} COMPILE_FLAGS ${PROTOBUF_MSVC_DISABLED_WARNINGS})
+ENDIF(MSVC)
+
 ADD_CONVENIENCE_LIBRARY(protobuf 
  ${LIBPROTOBUF_SOURCES} ${LIBPROTOBUF_LITE_SOURCES})
 TARGET_LINK_LIBRARIES(protobuf
@@ -201,6 +213,10 @@ SET(LIBPROTOC_SOURCES
  ${PROTO_SRC_DIR}/google/protobuf/compiler/python/python_generator.cc
 )
 
+IF(MSVC)
+ ADD_COMPILE_FLAGS(${LIBPROTOC_SOURCES} COMPILE_FLAGS ${PROTOBUF_MSVC_DISABLED_WARNINGS})
+ENDIF(MSVC)
+
 ADD_CONVENIENCE_LIBRARY(protoclib ${LIBPROTOC_SOURCES})
 ADD_EXECUTABLE(protoc ${PROTO_SRC_DIR}/google/protobuf/compiler/main.cc)
 TARGET_LINK_LIBRARIES(protoc protobuf protoclib protobuf)

extra/protobuf/protobuf-2.6.0/src/google/protobuf/generated_message_util.cc

@@ -51,8 +51,13 @@ double NaN() {
 const ::std::string* empty_string_;
 GOOGLE_PROTOBUF_DECLARE_ONCE(empty_string_once_init_);
 
+void DeleteEmptyString() {
+ delete empty_string_;
+}
+
 void InitEmptyString() {
  empty_string_ = new string;
+ OnShutdown(&DeleteEmptyString);
 }
 
 

mysql-test/suite/xplugin/r/installxplugin.result

@@ -53,9 +53,9 @@ RUN show variables like 'mysqlx_min_worker_threads%'
 Variable_name	Value
 mysqlx_min_worker_threads	2
 0 rows affected
-RUN SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_TYPE_VERSION,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%'
-PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPEPLUGIN_TYPE_VERSIONPLUGIN_LIBRARY_VERSION	LOAD_OPTION
-mysqlx	1.0	ACTIVE	DAEMON50712.01.6	ON
+RUN SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%'
+PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_LIBRARY_VERSION	LOAD_OPTION
+mysqlx	1.0	ACTIVE	DAEMON	1.6	ON
 0 rows affected
 Mysqlx.Ok {
  msg: "bye!"
@@ -151,9 +151,9 @@ mysqlx_max_connections	500
 show variables like 'mysqlx_min_worker_threads%';
 Variable_name	Value
 mysqlx_min_worker_threads	50
-SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_TYPE_VERSION,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
-PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPEPLUGIN_TYPE_VERSIONPLUGIN_LIBRARY_VERSION	LOAD_OPTION
-mysqlx	1.0	ACTIVE	DAEMON50712.01.6	ON
+SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
+PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_LIBRARY_VERSION	LOAD_OPTION
+mysqlx	1.0	ACTIVE	DAEMON	1.6	ON
 uninstall plugin mysqlx;
 # restart: --plugin-load=mysqlx.so --mysqlx_idle_worker_thread_timeout=70 --mysqlx_max_allowed_packet=4048576 --mysqlx_max_connections=500 --mysqlx_min_worker_threads=50
 show variables like 'mysqlx_idle_worker_thread_timeout%';
@@ -177,8 +177,8 @@ show variables like 'mysqlx_max_connections%';
 Variable_name	Value
 show variables like 'mysqlx_min_worker_threads%';
 Variable_name	Value
-SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_TYPE_VERSION,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
-PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPEPLUGIN_TYPE_VERSIONPLUGIN_LIBRARY_VERSION	LOAD_OPTION
+SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
+PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_LIBRARY_VERSION	LOAD_OPTION
 INSTALL PLUGIN mysqlx soname "mysqlx.so";
 uninstall plugin mysqlx;
 # restart: --max_connections=151
@@ -259,9 +259,9 @@ RUN show variables like 'mysqlx_min_worker_threads%'
 Variable_name	Value
 mysqlx_min_worker_threads	50
 0 rows affected
-RUN SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_TYPE_VERSION,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%'
-PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPEPLUGIN_TYPE_VERSIONPLUGIN_LIBRARY_VERSION	LOAD_OPTION
-mysqlx	1.0	ACTIVE	DAEMON50712.01.6	ON
+RUN SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%'
+PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_LIBRARY_VERSION	LOAD_OPTION
+mysqlx	1.0	ACTIVE	DAEMON	1.6	ON
 0 rows affected
 Mysqlx.Ok {
  msg: "bye!"
@@ -356,9 +356,9 @@ RUN show variables like 'mysqlx_min_worker_threads%'
 Variable_name	Value
 mysqlx_min_worker_threads	50
 0 rows affected
-RUN SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_TYPE_VERSION,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%'
-PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPEPLUGIN_TYPE_VERSIONPLUGIN_LIBRARY_VERSION	LOAD_OPTION
-mysqlx	1.0	ACTIVE	DAEMON50712.01.6	ON
+RUN SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%'
+PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_LIBRARY_VERSION	LOAD_OPTION
+mysqlx	1.0	ACTIVE	DAEMON	1.6	ON
 0 rows affected
 Mysqlx.Ok {
  msg: "bye!"

mysql-test/suite/xplugin/t/client_close.test

@@ -35,7 +35,7 @@ SELECT `user`,`host`,`db`,`command`,`state`,`info` FROM INFORMATION_SCHEMA.PROCE
 Mysqlx.Connection.Close {
 }
 -->recvtype Mysqlx.Ok
--->peerdisc 1000 1000
+-->peerdisc 1000 2000
 -->endmacro
 
 

mysql-test/suite/xplugin/t/installxplugin.test

@@ -32,7 +32,7 @@ show variables like 'mysqlx_idle_worker_thread_timeout%';
 show variables like 'mysqlx_max_allowed_packet%';
 show variables like 'mysqlx_max_connections%';
 show variables like 'mysqlx_min_worker_threads%';
-SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_TYPE_VERSION,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
+SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
 -->endsql
 EOF
 
@@ -134,7 +134,7 @@ show variables like 'mysqlx_max_allowed_packet%';
 show variables like 'mysqlx_max_connections%';
 show variables like 'mysqlx_min_worker_threads%';
 --replace_regex /\.dll/.so/
-SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_TYPE_VERSION,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
+SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
 
 ##uninstall mysqlx plugin with old protocol session when server started with mysqlx plugin variables with other than default values
 uninstall plugin mysqlx;
@@ -150,7 +150,7 @@ show variables like 'mysqlx_idle_worker_thread_timeout%';
 show variables like 'mysqlx_max_allowed_packet%';
 show variables like 'mysqlx_max_connections%';
 show variables like 'mysqlx_min_worker_threads%';
-SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_TYPE_VERSION,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
+SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS,PLUGIN_TYPE,PLUGIN_LIBRARY_VERSION,LOAD_OPTION from information_schema.plugins where PLUGIN_NAME LIKE 'mysqlx%';
 --replace_regex /\.dll/.so/
 --eval INSTALL PLUGIN mysqlx soname "$MYSQLXPLUGIN"
 

rapid/plugin/x/CMakeLists.txt

@@ -111,6 +111,9 @@ ELSE()
  SET(xplugin_PROTOBUF_LIB ${PROTOBUF_LITE_LIBRARY})
  ENDIF()
 
+ IF(MSVC)
+ ADD_COMPILE_FLAGS(${PROTO_SRCS} ${PROTO_LITE_SRCS} COMPILE_FLAGS "/wd4018")
+ ENDIF(MSVC)
 
  # Built *without* -DMYSQL_DYNAMIC_PLUGIN
  ADD_CONVENIENCE_LIBRARY(xplugin ${xplugin_SRC} ${xplugin_HDRS} ${xplugin_PROTOBUF_SRC})