Commit resolved files

Author: Buggynours

.gitignore

@@ -48,6 +48,7 @@ extra/jemalloc/build/
 extra/jemalloc/tmp/
 extra/my_print_defaults
 extra/mysql_waitpid
+extra/mysqld_safe_helper
 extra/perror
 extra/replace
 extra/resolve_stack_dump
@@ -90,6 +91,9 @@ pcre/pcre_chartables.c
 pcre/pcregrep
 pcre/pcretest
 pcre/test*grep
+plugin/aws_key_management/aws-sdk-cpp
+plugin/aws_key_management/aws_sdk_cpp
+plugin/aws_key_management/aws_sdk_cpp-prefix
 scripts/comp_sql
 scripts/make_binary_distribution
 scripts/msql2mysql
@@ -217,6 +221,7 @@ support-files/mysql.spec
 support-files/mysqld_multi.server
 support-files/wsrep.cnf
 support-files/wsrep_notify
+support-files/policy/selinux/mysqld-safe.pp
 tags
 tests/async_queries
 tests/bug25714

BUILD/compile-bintar

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA.
 
 
 # This script's purpose is to build the binary tarball packages for MariaDB

BUILD/compile-pentium64-wsrep

@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02111-1301, USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"

BUILD/util.sh

@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA.
 
 # Setting cpu options.
 get_cpuopt () {

CMakeLists.txt

@@ -283,7 +283,7 @@ ENDIF()
 
 # Set commonly used variables
 IF(WIN32)
-  SET(DEFAULT_MYSQL_HOME "C:/MariaDB${MYSQL_BASE_VERSION}")
+  SET(DEFAULT_MYSQL_HOME "C:/Program Files/MariaDB ${MYSQL_BASE_VERSION}")
   SET(SHAREDIR share)
 ELSE()
   SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX})
@@ -328,6 +328,9 @@ SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 
 # Common defines and includes
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+IF(_FILE_OFFSET_BITS)
+  ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=${_FILE_OFFSET_BITS})
+ENDIF()
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include)
 
 # Add bundled or system zlib.
@@ -464,8 +467,9 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
-INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty
+INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty
                       EXCEPTIONS-CLIENT COMPONENT Readme)
+
 # MDEV-6526 these files are not installed anymore
 #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
 #                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)

COPYING.LESSER

@@ -1187,7 +1187,7 @@ Use of any of this software is governed by the terms of the license below:
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 /*
  * Copyright (c) 1997, 1999 Kungliga Tekniska H366gskolan

COPYING.thirdparty

@@ -3,16 +3,18 @@ organization registered in the USA.
 
 The current main sponsors of the MariaDB Foundation are:
 
-Booking.com			http://www.booking.com (2013 - 2016)
-Development Bank of Singapore   http://dbs.com (2016)
-MariaDB Corporation		https://www.mariadb.com  (2013 - 2016)
-Visma                           http://visma.com (2015 - 2016)
-Acronis                         http://acronis.com (2016)
-Nexedi				https://www.nexedi.com (2016)
-Automattic              	https://automattic.com  (2014 - 2016)
-Tencent Game DBA		http://tencentdba.com/about (2016)
-Verkkokauppa.com		https://www.verkkokauppa.com (2015 - 2016)
-Virtuozzo                       https://virtuozzo.com (2016)
+Alibaba Cloud                   https://intl.aliyun.com (2017)
+Booking.com			https://www.booking.com (2013 - 2017)
+Development Bank of Singapore   https://dbs.com (2016 - 2017)
+MariaDB Corporation		https://www.mariadb.com  (2013 - 2017)
+Visma                           https://visma.com (2015 - 2017)
+Acronis                         http://acronis.com (2016 - 2017)
+Nexedi				https://www.nexedi.com (2016 - 2017)
+Automattic              	https://automattic.com  (2014 - 2017)
+Tencent Game DBA		http://tencentdba.com/about (2016 - 2017)
+Tencent TDSQL			http://tdsql.org/ (2016 - 2017)
+Verkkokauppa.com		https://www.verkkokauppa.com (2015 - 2017)
+Virtuozzo                       https://virtuozzo.com (2016 - 2017)
 
 For a full list of sponsors, see
 https://mariadb.org/about/supporters/

CREDITS

@@ -1,3 +1,3 @@
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=1
-MYSQL_VERSION_PATCH=21
+MYSQL_VERSION_PATCH=23

VERSION

@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 /* mysql command tool
  * Commands compatible with mSQL by David J. Hughes