Merge branch 'mysql-5.7' of myrepo.no.oracle.com:mysql into mysql-5.7

Author: gkodinov

client/CMakeLists.txt

@@ -18,6 +18,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/mysys_ssl
   ${ZLIB_INCLUDE_DIR}
+  ${LZ4_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libmysql
   ${CMAKE_SOURCE_DIR}/libbinlogevents/include
@@ -27,14 +28,76 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+# Prevent Boost from including external precompiled Boost libraries, use
+# threading (not implemented for Solaris) and turn off unused functionality.
+ADD_DEFINITIONS(
+  -DBOOST_ALL_NO_LIB
+  -DBOOST_SYSTEM_NO_DEPRECATED)
+
 ## Subdirectory with common client code.
 ADD_SUBDIRECTORY(base)
+## Subdirectory for mysqlpump code.
+ADD_SUBDIRECTORY(dump)
 
 ## We will need libeay32.dll and ssleay32.dll when running client executables.
 COPY_OPENSSL_DLLS(copy_openssl_client)
 
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 
+IF(WIN32)
+  LIST(APPEND BOOST_THREAD_SOURCES
+    ${BOOST_INCLUDE_DIR}/libs/thread/src/win32/thread.cpp
+    ${BOOST_INCLUDE_DIR}/libs/thread/src/win32/tss_dll.cpp
+    ${BOOST_INCLUDE_DIR}/libs/thread/src/win32/tss_pe.cpp
+  )
+ELSE()
+  LIST(APPEND BOOST_THREAD_SOURCES
+    ${BOOST_INCLUDE_DIR}/libs/thread/src/pthread/once.cpp
+    ${BOOST_INCLUDE_DIR}/libs/thread/src/pthread/thread.cpp
+  )
+ENDIF()
+
+SET(BOOST_LIB_SOURCES
+  ${CMAKE_SOURCE_DIR}/include/boost_1_57_0/libs/atomic/src/lockpool.cpp
+  ${BOOST_INCLUDE_DIR}/libs/chrono/src/chrono.cpp
+  ${BOOST_INCLUDE_DIR}/libs/chrono/src/process_cpu_clocks.cpp
+  ${BOOST_INCLUDE_DIR}/libs/chrono/src/thread_clock.cpp
+  ${BOOST_INCLUDE_DIR}/libs/system/src/error_code.cpp
+  ${BOOST_INCLUDE_DIR}/libs/thread/src/future.cpp
+)
+
+ADD_CONVENIENCE_LIBRARY(boost_lib
+  ${BOOST_LIB_SOURCES}
+  ${BOOST_THREAD_SOURCES}
+)
+
+SET_TARGET_PROPERTIES(boost_lib
+  PROPERTIES COMPILE_FLAGS "-DBOOST_THREAD_BUILD_LIB")
+
+# Do not build library unless it is needed by some other target.
+SET_PROPERTY(TARGET boost_lib PROPERTY EXCLUDE_FROM_ALL TRUE)
+
+MY_CHECK_CXX_COMPILER_FLAG("-Wno-logical-op" HAVE_NO_LOGICAL_OP)
+IF(HAVE_NO_LOGICAL_OP)
+  ADD_COMPILE_FLAGS(
+    ${BOOST_INCLUDE_DIR}/libs/thread/src/pthread/thread.cpp
+    COMPILE_FLAGS "-Wno-logical-op"
+  )
+ENDIF()
+
+ADD_COMPILE_FLAGS(
+  ${BOOST_LIB_SOURCES}
+  ${BOOST_THREAD_SOURCES}
+  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+)
+
+# Need explicit pthread for gcc -fsanitize=address
+IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
+  TARGET_LINK_LIBRARIES(boost_lib pthread)
+ENDIF()
+
 ADD_DEFINITIONS(${SSL_DEFINES})
 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
 TARGET_LINK_LIBRARIES(mysql mysqlclient)
@@ -45,12 +108,12 @@ ENDIF(UNIX)
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
     upgrade/program.cc
-    upgrade/mysql_query_runner.cc
-    upgrade/show_variable_query_extractor.cc
-    ../sql-common/sql_string.cc
   )
-  TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
-  ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
+ADD_COMPILE_FLAGS(
+  upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+)
+TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
+ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
 ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)

client/base/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,4 +33,26 @@ ADD_CONVENIENCE_LIBRARY(client_base
 
   abstract_program.cc
   abstract_connection_program.cc
+
+  message_data.cc
+  mysql_query_runner.cc
+  show_variable_query_extractor.cc
+
+  mutex.cc
+
+  ../get_password.c
+
+  ../../sql-common/sql_string.cc
 )
+
+ADD_COMPILE_FLAGS(
+  mutex.cc
+  mysql_query_runner.cc
+  show_variable_query_extractor.cc
+  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+)
+
+TARGET_LINK_LIBRARIES(client_base mysqlclient boost_lib)
+
+# Do not build library unless it is needed by some other target.
+SET_PROPERTY(TARGET client_base PROPERTY EXCLUDE_FROM_ALL TRUE)

client/base/abstract_connection_program.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,3 +30,13 @@ MYSQL* Abstract_connection_program::create_connection()
 {
   return this->m_connection_options.create_connection();
 }
+
+CHARSET_INFO* Abstract_connection_program::get_current_charset() const
+{
+  return m_connection_options.get_current_charset();
+}
+
+void Abstract_connection_program::set_current_charset(CHARSET_INFO* charset)
+{
+  m_connection_options.set_current_charset(charset);
+}

client/base/abstract_connection_program.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,14 +31,11 @@ namespace Mysql{
 namespace Tools{
 namespace Base{
 
-using std::string;
-using std::vector;
-
 /**
   Base class for all programs that use connection to MySQL database server.
  */
 class Abstract_connection_program
-  : public Abstract_program, I_connection_factory
+  : public Abstract_program, public I_connection_factory
 {
 public:
   /**
@@ -47,6 +44,17 @@ class Abstract_connection_program
    */
   virtual MYSQL* create_connection();
 
+  /**
+    Retrieves charset that will be used in new MySQL connections. Can be NULL
+    if none was set explicitly.
+   */
+  CHARSET_INFO* get_current_charset() const;
+
+  /**
+    Sets charset that will be used in new MySQL connections.
+   */
+  void set_current_charset(CHARSET_INFO* charset);
+
 protected:
   Abstract_connection_program();
 

client/base/abstract_integer_number_option.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2015  Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,8 +26,6 @@ namespace Tools{
 namespace Base{
 namespace Options{
 
-using std::string;
-
 /**
   Abstract option to handle integer number option values.
  */
@@ -68,12 +66,14 @@ template<typename T_type, typename T_value> class Abstract_integer_number_option
     @param desription Description of option to be printed in --help.
    */
   Abstract_integer_number_option(
-    T_value* value, ulong var_type, string name, string description);
+    T_value* value, ulong var_type, std::string name, std::string description);
 };
 
 template<typename T_type, typename T_value>
-Abstract_integer_number_option<T_type, T_value>::Abstract_integer_number_option(
-    T_value* value, ulong var_type, string name, string description)
+  Abstract_integer_number_option<T_type, T_value>::
+    Abstract_integer_number_option(
+      T_value* value, ulong var_type, std::string name,
+      std::string description)
   : Abstract_number_option<T_type, T_value>(
       value, var_type, name, description, 0)
 {

client/base/abstract_number_option.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,8 +26,6 @@ namespace Tools{
 namespace Base{
 namespace Options{
 
-using std::string;
-
 /**
   Abstract option to handle numeric option values.
  */
@@ -57,14 +55,14 @@ template<typename T_type, typename T_value> class Abstract_number_option
     @param default_value default value to be supplied to internal option
       data structure.
    */
-  Abstract_number_option(T_value* value, ulong var_type, string name,
-    string description, uint64 default_value);
+  Abstract_number_option(T_value* value, ulong var_type, std::string name,
+    std::string description, uint64 default_value);
 };
 
 
 template<typename T_type, typename T_value>Abstract_number_option<T_type, T_value>
 ::Abstract_number_option(
-  T_value* value, ulong var_type, string name, string description,
+  T_value* value, ulong var_type, std::string name, std::string description,
   uint64 default_value)
   : Abstract_value_option<T_type>(
       value, var_type, name, description, default_value)

client/base/abstract_option.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,10 +30,6 @@ namespace Tools{
 namespace Base{
 namespace Options{
 
-using std::string;
-using std::vector;
-using Base::I_callable;
-
 class Abstract_options_provider;
 
 /**
@@ -50,7 +46,7 @@ template<typename T_type> class Abstract_option : public I_option
     I_Callable can be replaced with std::Function<void(char*)> once we get
     one.
    */
-  T_type* add_callback(I_callable<void, char*>* callback);
+  T_type* add_callback(Mysql::I_callable<void, char*>* callback);
 
   /**
     Sets optid to given character to make possible usage of short option
@@ -69,8 +65,8 @@ template<typename T_type> class Abstract_option : public I_option
     @param default_value default value to be supplied to internal option
       data structure.
    */
-  Abstract_option(void* value, ulong var_type, string name, string description,
-    uint64 default_value);
+  Abstract_option(void* value, ulong var_type, std::string name,
+    std::string description, uint64 default_value);
 
   /**
     Returns my_getopt internal option data structure representing this option.
@@ -90,7 +86,7 @@ template<typename T_type> class Abstract_option : public I_option
 private:
   void call_callbacks(char* argument);
 
-  vector<I_callable<void, char*>*> m_callbacks;
+  std::vector<Mysql::I_callable<void, char*>*> m_callbacks;
   I_option_changed_listener* m_option_changed_listener;
 
   friend class Abstract_options_provider;
@@ -101,21 +97,24 @@ template<typename T_type> Abstract_option<T_type>::~Abstract_option()
   my_free((void*)this->m_option_structure.name);
   my_free((void*)this->m_option_structure.comment);
 
-  for (vector<I_callable<void, char*>*>::iterator it= this->m_callbacks.begin();
+  for (std::vector<Mysql::I_callable<void, char*>*>::iterator
+    it= this->m_callbacks.begin();
     it != this->m_callbacks.end();
     it++)
   {
     delete *it;
   }
 }
 
-template<typename T_type> T_type* Abstract_option<T_type>::add_callback(I_callable<void, char*>* callback)
+template<typename T_type> T_type* Abstract_option<T_type>::add_callback(
+  Mysql::I_callable<void, char*>* callback)
 {
   this->m_callbacks.push_back(callback);
   return (T_type*)this;
 }
 
-template<typename T_type> T_type* Abstract_option<T_type>::set_short_character(char code)
+template<typename T_type> T_type* Abstract_option<T_type>::set_short_character(
+  char code)
 {
   // Change optid to new one
   uint32 old_optid= this->m_option_structure.id;
@@ -124,14 +123,16 @@ template<typename T_type> T_type* Abstract_option<T_type>::set_short_character(c
   // Inform that it has changed
   if (this->m_option_changed_listener != NULL)
   {
-    this->m_option_changed_listener->notify_option_optid_changed(this, old_optid);
+    this->m_option_changed_listener->notify_option_optid_changed(
+      this, old_optid);
   }
 
   return (T_type*)this;
 }
 
 template<typename T_type> Abstract_option<T_type>::Abstract_option(void* value,
-    ulong var_type, string name, string description, uint64 default_value)
+    ulong var_type, std::string name, std::string description,
+    uint64 default_value)
   : m_option_changed_listener(NULL)
 {
   this->m_option_structure.block_size= 0;
@@ -168,17 +169,21 @@ template<typename T_type> my_option Abstract_option<T_type>::get_my_option()
   return this->m_option_structure;
 }
 
-template<typename T_type> void Abstract_option<T_type>::set_option_changed_listener(I_option_changed_listener* listener)
+template<typename T_type> void
+  Abstract_option<T_type>::set_option_changed_listener(
+    I_option_changed_listener* listener)
 {
   DBUG_ASSERT(this->m_option_changed_listener == NULL);
 
   this->m_option_changed_listener= listener;
 }
 
-template<typename T_type> void Abstract_option<T_type>::call_callbacks(char* argument)
+template<typename T_type> void Abstract_option<T_type>::call_callbacks(
+  char* argument)
 {
-  vector<I_callable<void, char*>*>::iterator callback_it;
-  for (callback_it= this->m_callbacks.begin(); callback_it != this->m_callbacks.end(); callback_it++)
+  std::vector<Mysql::I_callable<void, char*>*>::iterator callback_it;
+  for (callback_it= this->m_callbacks.begin();
+    callback_it != this->m_callbacks.end(); callback_it++)
   {
     (**callback_it)(argument);
   }