WL#8896: Enable use of C++11 in MySQL server

This patch turns on C++11 support for MySQL 5.8. This is done by
explicitly setting -std=c++11 for GCC, Clang and Solaris Studio.

In order to get a near complete level of C++11 support, the patch
raises the minimum required version of different compilers to:
- GCC 4.8
- Clang 3.4
- Solaris Studio 12.4

Visual Studio minimum is still 2013. It will be raised to 2015
in a separate patch. This will bring C++11 support on Windows
more in line with other compilers.

A consequence of using -std=c++11 for Solaris Studio is that
we no longer link with stlport. Solaris Studio will automatically
use the g++ runtime library instead.

The patch also fixes various new compilation errors and removes
some old obsolete workarounds. Note that new deprecation errors
(std::auto_ptr and the register keyword) are explicitly downgraded
to warnings. It will be up to individual teams to fix these new
warnings.

RPM spec is updated to remove support for RHEL5/OL5 and to
use compilers from Devtoolset to build on RHEL6/OL6. This is
needed to meet new compiler version requirements.

Finally the patch includes some limited testing of new C++11
features (compiler and library).

Author: jhauglid

client/auth_utils.cc

@@ -61,7 +61,7 @@ int parse_cnf_file(istream &sin, map<string, string > *options,
     getline(sin, option_value);
     trim(&option_value);
     if (option_name.length() > 0)
-      options->insert(make_pair<string, string >(option_name, option_value));
+      options->insert(make_pair(option_name, option_value));
   }
   return ALL_OK;
   } catch(...)

client/base/help_options.cc

@@ -74,10 +74,9 @@ void Mysql::Tools::Base::Options::Help_options::print_usage()
 
   this->print_version_line();
 
-  std::string first_year_str=
-    (static_cast<std::ostringstream*>(&(
-    std::ostringstream() << this->m_program->get_first_release_year()))
-    ->str());
+  std::ostringstream s;
+  s << m_program->get_first_release_year();
+  string first_year_str(s.str());
   string copyright;
 
   if (first_year_str == COPYRIGHT_NOTICE_CURRENT_YEAR)

client/check/mysqlcheck.cc

@@ -531,6 +531,12 @@ int main(int argc, char **argv)
   if (dbConnect(current_host, current_user, opt_password))
     exit(EX_MYSQLERR);
 
+  // Sun Studio does not work with range constructor from char** to string.
+  vector<string> conv;
+  conv.reserve(argc);
+  for (int i= 0; i < argc; i++)
+    conv.push_back(argv[i]);
+
   mysql_check(sock, what_to_do, opt_alldbs,
                 opt_check_only_changed, opt_extended,
                 opt_databases, opt_fast,
@@ -540,7 +546,7 @@ int main(int argc, char **argv)
                 opt_frm, opt_fix_table_names,
                 opt_fix_db_names, opt_upgrade,
                 opt_write_binlog, verbose,
-                opt_skip_database, vector<string>(argv, argv+argc),
+                opt_skip_database, conv,
                 DBerror);
 
   dbDisconnect(current_host);

client/client_priv.h

@@ -20,6 +20,16 @@
 
 /* Common defines for all clients */
 
+/*
+  This include needs to be before my_compiler.h (via my_global.h)
+  is included. This is because string conflicts with the define
+  of __attribute__ in my_compiler.h on Sun Studio x86.
+  TODO: Get rid of the __attribute__ define in my_compiler.h
+*/
+#ifdef __cplusplus
+#include <string>
+#endif
+
 #include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>

client/dump/abstract_chain_element.h

@@ -41,6 +41,9 @@ class Abstract_chain_element : public virtual I_chain_element,
    */
   uint64 get_id() const;
 
+  /** Disable move assignment to avoid Wvirtual-move-assign warning */
+  Abstract_chain_element& operator= (Abstract_chain_element&& other) = delete;
+
 protected:
   Abstract_chain_element(
     Mysql::I_callable<bool, const Mysql::Tools::Base::Message_data&>*

client/mysqladmin.cc

@@ -26,7 +26,6 @@
 #include <sql_common.h>
 #include <welcome_copyright_notice.h>           /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 #include <mysqld_error.h>                       /* to check server error codes */
-#include <string>  /* std::string */
 #include "mysql/service_mysql_alloc.h"
 
 #define ADMIN_VERSION "8.42"

cmake/build_configurations/compiler_options.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -28,7 +28,7 @@ IF(UNIX)
 
   # Default GCC flags
   IF(CMAKE_COMPILER_IS_GNUCC)
-    SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
     # Disable inline optimizations for valgrind testing to avoid false positives
     IF(WITH_VALGRIND)
       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
@@ -37,7 +37,7 @@ IF(UNIX)
     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
   ENDIF()
   IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing -std=c++11")
     # Disable inline optimizations for valgrind testing to avoid false positives
     IF(WITH_VALGRIND)
       SET(COMMON_CXX_FLAGS             "-fno-inline ${COMMON_CXX_FLAGS}")
@@ -53,7 +53,7 @@ IF(UNIX)
     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
   ENDIF()
   IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing -std=c++11")
     SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
     SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
   ENDIF()
@@ -80,15 +80,11 @@ IF(UNIX)
     ENDIF()
 
     IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
-
-      SET(SUNPRO_CXX_LIBRARY "stlport4" CACHE STRING
-        "What C++ library to use. The server needs stlport4. It is possible to build the client libraries with -DWITHOUT_SERVER=1 -DSUNPRO_CXX_LIBRARY=Cstd")
-
-      MESSAGE(STATUS "SUNPRO_CXX_LIBRARY ${SUNPRO_CXX_LIBRARY}")
+      SET(COMMON_CXX_FLAGS                  "-std=c++11")
 
       IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
         SET(COMMON_C_FLAGS                   "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
-        SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic -library=${SUNPRO_CXX_LIBRARY}")
+        SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic ${COMMON_CXX_FLAGS}")
         # We have to specify "-xO1" for DEBUG flags here,
         # see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6879978
         SET(CMAKE_C_FLAGS_DEBUG              "-xO1 ${COMMON_C_FLAGS}")
@@ -103,7 +99,7 @@ IF(UNIX)
       ELSE() 
         # Assume !x86 is SPARC
         SET(COMMON_C_FLAGS                 "-g -Xa -xstrconst -mt")
-        SET(COMMON_CXX_FLAGS               "-g0 -mt -library=${SUNPRO_CXX_LIBRARY}")
+        SET(COMMON_CXX_FLAGS               "-g0 -mt ${COMMON_CXX_FLAGS}")
         IF(32BIT)
           SET(COMMON_C_FLAGS               "${COMMON_C_FLAGS} -xarch=sparc")
           SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS} -xarch=sparc")

cmake/maintainer.cmake

@@ -47,6 +47,16 @@ MY_ADD_CXX_WARNING_FLAG("Wlogical-op")
 MY_ADD_C_WARNING_FLAG("Wundef")
 MY_ADD_CXX_WARNING_FLAG("Wundef")
 
+# Temporarily convert C++11 related errors to warnings
+MY_CHECK_CXX_COMPILER_FLAG("-Wdeprecated-declarations" HAVE_DEPRECATED_DECLARATIONS)
+IF(HAVE_DEPRECATED_DECLARATIONS)
+  SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Wno-error=deprecated-declarations")
+ENDIF()
+MY_CHECK_CXX_COMPILER_FLAG("-Wdeprecated-register" HAVE_DEPRECATED_REGISTER)
+IF(HAVE_DEPRECATED_REGISTER)
+  SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Wno-error=deprecated-register")
+ENDIF()
+
 # Turn on extra Clang warnings in maintainer mode
 IF(CMAKE_C_COMPILER_ID MATCHES "Clang" AND MYSQL_MAINTAINER_MODE)
   MY_ADD_C_WARNING_FLAG("Wconditional-uninitialized")
@@ -70,8 +80,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
   # Turn on extra Clang++ warnings in maintainer mode
   IF(MYSQL_MAINTAINER_MODE)
-    MY_ADD_CXX_WARNING_FLAG("Wc++11-compat-reserved-user-defined-literal")
-    MY_ADD_CXX_WARNING_FLAG("Wc++11-extra-semi")
     MY_ADD_CXX_WARNING_FLAG("Wconditional-uninitialized")
     MY_ADD_CXX_WARNING_FLAG("Wheader-hygiene")
     MY_ADD_CXX_WARNING_FLAG("Wnon-virtual-dtor")

cmake/os/Darwin.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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
@@ -17,17 +17,17 @@
 
 INCLUDE(CheckCSourceRuns)
 
-# We require at least Clang 3.3 (XCode 5).
+# We require at least Clang 3.6 (XCode 7).
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
     CHECK_C_SOURCE_RUNS("
       int main()
       {
         return (__clang_major__ < 3) ||
-               (__clang_major__ == 3 && __clang_minor__ < 3);
+               (__clang_major__ == 3 && __clang_minor__ < 6);
       }" HAVE_SUPPORTED_CLANG_VERSION)
     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-      MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
+      MESSAGE(FATAL_ERROR "Clang 3.6 or newer is required!")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Unsupported compiler!")

cmake/os/FreeBSD.cmake

@@ -1,5 +1,4 @@
-
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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
@@ -18,17 +17,17 @@
 
 INCLUDE(CheckCSourceRuns)
 
-# We require at least Clang 3.3.
+# We require at least Clang 3.4.
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
     CHECK_C_SOURCE_RUNS("
       int main()
       {
         return (__clang_major__ < 3) ||
-               (__clang_major__ == 3 && __clang_minor__ < 3);
+               (__clang_major__ == 3 && __clang_minor__ < 4);
       }" HAVE_SUPPORTED_CLANG_VERSION)
     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-      MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
+      MESSAGE(FATAL_ERROR "Clang 3.4 or newer is required!")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Unsupported compiler!")