WL#6835 - Merge from mysql-trunk

Author: Sunny Bains

client/base/abstract_program.cc

@@ -143,3 +143,8 @@ void Abstract_program::aggregate_options()
     {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0};
   this->m_options.push_back(sentinel);
 }
+
+void Mysql::Tools::Base::Abstract_program::print_usage()
+{
+  this->m_help_options.print_usage();
+}

client/base/abstract_program.h

@@ -80,6 +80,11 @@ class Abstract_program : public Options::Composite_options_provider
    */
   virtual int execute(vector<string> positional_options)= 0;
 
+  /**
+   Prints usage message. Does not end the program execution.
+  */
+  void print_usage();
+
 protected:
   Abstract_program();
 

client/base/help_options.cc

@@ -38,10 +38,16 @@ void Help_options::create_options()
 }
 
 void Help_options::help_callback(char* argument __attribute__((unused)))
+{
+  this->print_usage();
+  exit(0);
+}
+
+void Mysql::Tools::Base::Options::Help_options::print_usage()
 {
   std::string first_year_str=
     (static_cast<std::ostringstream*>(&(
-      std::ostringstream() << this->m_program->get_first_release_year()) )
+      std::ostringstream() << this->m_program->get_first_release_year()))
     ->str());
   string copyright;
 
@@ -60,11 +66,10 @@ void Help_options::help_callback(char* argument __attribute__((unused)))
   }
 
   printf("%s  Ver %s Distrib %s, for %s (%s)\n%s\n%s\n",
-          this->m_program->get_name().c_str(),
-          this->m_program->get_version().c_str(),
-          MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
-          copyright.c_str(),
-          this->m_program->get_description().c_str());
+    this->m_program->get_name().c_str(),
+    this->m_program->get_version().c_str(),
+    MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
+    copyright.c_str(),
+    this->m_program->get_description().c_str());
   my_print_help(this->m_program->get_options_array());
-  exit(0);
 }

client/base/help_options.h

@@ -45,6 +45,10 @@ class Help_options : public Abstract_options_provider
     Implementation of Abstract_options_provider virtual method.
    */
   virtual void create_options();
+  /**
+    Prints program usage message.
+  */
+  virtual void print_usage();
 
 private:
   void help_callback(char* argument __attribute__((unused)));

client/base/mysql_connection_options.cc

@@ -101,7 +101,9 @@ void Mysql_connection_options::create_options()
     "The socket file to use for connection.")
     ->set_short_character('S');
   this->create_new_option(&this->m_secure_auth, "secure-auth",
-    "Refuse client connecting to server if it uses old (pre-4.1.1) protocol.");
+      "Refuse client connecting to server if it uses old (pre-4.1.1) protocol. Deprecated. Always TRUE")
+    ->add_callback(new Instance_callback<void, char*, Mysql_connection_options>
+      (this, &Mysql_connection_options::secure_auth_callback));
   this->create_new_option(&this->m_user, "user",
     "User for login if not current user.")
     ->set_short_character('u');
@@ -202,7 +204,18 @@ void Mysql_connection_options::protocol_callback(
 {
   this->m_protocol=
     find_type_or_exit(this->m_protocol_string.value().c_str(), &sql_protocol_typelib,
-      "protocol");
+    "protocol");
+}
+
+void Mysql_connection_options::secure_auth_callback(
+  char* not_used __attribute__((unused)))
+{
+  CLIENT_WARN_DEPRECATED_NO_REPLACEMENT("--secure-auth");
+  if (!this->m_secure_auth)
+  {
+    this->m_program->print_usage();
+    exit(1);
+  }
 }
 
 

client/base/mysql_connection_options.h

@@ -96,6 +96,7 @@ class Mysql_connection_options
   void pipe_protocol_callback(char* not_used __attribute__((unused)));
 #endif
   void protocol_callback(char* not_used __attribute__((unused)));
+  void secure_auth_callback(char* argument __attribute__((unused)));
 
   static bool mysql_inited;
 

cmake/dtrace.cmake

@@ -13,30 +13,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX
-  AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-  IF(NOT DEFINED BUGGY_GCC_NO_DTRACE_MODULES)
-    EXECUTE_PROCESS(
-      COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}  --version
-      OUTPUT_VARIABLE out)
-    IF(out MATCHES "3.4.6")
-     # This gcc causes crashes in dlopen() for dtraced shared libs,
-     # while standard shipped with Solaris10 3.4.3 is ok
-     SET(BUGGY_GCC_NO_DTRACE_MODULES 1 CACHE INTERNAL "")
-    ELSE()
-     SET(BUGGY_GCC_NO_DTRACE_MODULES 0 CACHE INTERNAL "")
-    ENDIF()
-  ENDIF()
-ENDIF()
-
 # Check if OS supports DTrace
 MACRO(CHECK_DTRACE)
  FIND_PROGRAM(DTRACE dtrace)
  MARK_AS_ADVANCED(DTRACE)
 
  # On FreeBSD, dtrace does not handle userland tracing yet
- IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
-     AND NOT BUGGY_GCC_NO_DTRACE_MODULES)
+ IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
    SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
  ENDIF()
  SET(HAVE_DTRACE ${ENABLE_DTRACE})
@@ -91,12 +74,6 @@ IF(ENABLE_DTRACE)
 ENDIF()
 
 FUNCTION(DTRACE_INSTRUMENT target)
-  IF(BUGGY_GCC_NO_DTRACE_MODULES)
-    GET_TARGET_PROPERTY(target_type ${target} TYPE)
-    IF(target_type MATCHES "MODULE_LIBRARY")
-      RETURN()
-    ENDIF()
-  ENDIF()
   IF(ENABLE_DTRACE)
     ADD_DEPENDENCIES(${target} gen_dtrace_header)
 

cmake/os/WindowsCache.cmake

@@ -47,7 +47,6 @@ SET(HAVE_IEEEFP_H CACHE  INTERNAL "")
 SET(HAVE_LANGINFO_H CACHE  INTERNAL "")
 SET(HAVE_MALLOC_H 1 CACHE  INTERNAL "")
 SET(HAVE_NETINET_IN_H CACHE  INTERNAL "")
-SET(HAVE_PATHS_H CACHE  INTERNAL "")
 SET(HAVE_POLL_H CACHE  INTERNAL "")
 SET(HAVE_PWD_H CACHE  INTERNAL "")
 SET(HAVE_STRINGS_H CACHE  INTERNAL "")

config.h.cmake

@@ -45,7 +45,6 @@
 #cmakedefine HAVE_LANGINFO_H 1
 #cmakedefine HAVE_MALLOC_H 1
 #cmakedefine HAVE_NETINET_IN_H 1
-#cmakedefine HAVE_PATHS_H 1
 #cmakedefine HAVE_POLL_H 1
 #cmakedefine HAVE_PWD_H 1
 #cmakedefine HAVE_STRINGS_H 1
@@ -193,7 +192,6 @@
 #cmakedefine HAVE_UINT 1
 #cmakedefine HAVE_ULONG 1
 #cmakedefine HAVE_U_INT32_T 1
-#cmakedefine HAVE_FP_EXCEPT 1
 
 /* Code tests*/
 #cmakedefine STACK_DIRECTION @STACK_DIRECTION@

configure.cmake

@@ -373,7 +373,6 @@ CHECK_INCLUDE_FILES (ieeefp.h HAVE_IEEEFP_H)
 CHECK_INCLUDE_FILES (langinfo.h HAVE_LANGINFO_H)
 CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
 CHECK_INCLUDE_FILES (netinet/in.h HAVE_NETINET_IN_H)
-CHECK_INCLUDE_FILES (paths.h HAVE_PATHS_H)
 CHECK_INCLUDE_FILES (poll.h HAVE_POLL_H)
 CHECK_INCLUDE_FILES (pwd.h HAVE_PWD_H)
 CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)

include/keycache.h

@@ -110,13 +110,13 @@ typedef struct st_key_cache
 extern KEY_CACHE dflt_key_cache_var, *dflt_key_cache;
 
 extern int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
-			  size_t use_mem, uint division_limit,
-			  uint age_threshold);
+			  size_t use_mem, ulonglong division_limit,
+			  ulonglong age_threshold);
 extern int resize_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
-			    size_t use_mem, uint division_limit,
-			    uint age_threshold);
-extern void change_key_cache_param(KEY_CACHE *keycache, uint division_limit,
-				   uint age_threshold);
+			    size_t use_mem, ulonglong division_limit,
+			    ulonglong age_threshold);
+extern void change_key_cache_param(KEY_CACHE *keycache, ulonglong division_limit,
+				   ulonglong age_threshold);
 extern uchar *key_cache_read(KEY_CACHE *keycache,
                             File file, my_off_t filepos, int level,
                             uchar *buff, uint length,

include/my_compiler.h

@@ -40,6 +40,22 @@
 #  define MY_GNUC_PREREQ(maj, min) (0)
 #endif
 
+/*
+  The macros below are borrowed from include/linux/compiler.h in the
+  Linux kernel. Use them to indicate the likelyhood of the truthfulness
+  of a condition. This serves two purposes - newer versions of gcc will be
+  able to optimize for branch predication, which could yield siginficant
+  performance gains in frequently executed sections of the code, and the
+  other reason to use them is for documentation
+*/
+#ifdef HAVE_BUILTIN_EXPECT
+#  define likely(x)    __builtin_expect((x),1)
+#  define unlikely(x)  __builtin_expect((x),0)
+#else
+#  define likely(x)    (x)
+#  define unlikely(x)  (x)
+#endif
+
 /* Comunicate to the compiler the unreachability of the code. */
 #ifdef HAVE_BUILTIN_UNREACHABLE
 #  define MY_ASSERT_UNREACHABLE()   __builtin_unreachable()
@@ -66,6 +82,11 @@
 # define inline __inline
 #endif
 
+/* Provide __func__ macro definition for Visual Studio. */
+#if defined(_MSC_VER)
+#  define __func__ __FUNCTION__
+#endif
+
 /**
   C++ Type Traits
 */