Merge branch '5.5' into bug1688161-5.5

.gitattributes

@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.gitignore export-ignore

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2017, 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
@@ -260,12 +260,9 @@ IF (WITH_ASAN)
  ENDIF()
 ENDIF()
 
-
-OPTION(ENABLE_DEBUG_SYNC "Enable debug sync (debug builds only)" ON) 
-IF(ENABLE_DEBUG_SYNC) 
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") 
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") 
-ENDIF() 
+# Always enable debug sync for debug builds.
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
 
 OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
 IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE)

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=51
-MYSQL_VERSION_EXTRA=-38.1
+MYSQL_VERSION_PATCH=55
+MYSQL_VERSION_EXTRA=-38.8

build-ps/build-binary.sh

@@ -234,6 +234,7 @@ fi
  -DCOMPILATION_COMMENT="$COMMENT" \
  -DWITH_PAM=ON \
  -DWITH_READLINE=ON \
+ -DWITH_SCALABILITY_METRICS=ON \
  $OPENSSL_INCLUDE $OPENSSL_LIBRARY $CRYPTO_LIBRARY
 
  make $MAKE_JFLAG $QUIET

build-ps/debian/percona-server-server-5.5.preinst

@@ -15,6 +15,7 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
 export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 DATADIR=/var/lib/mysql
+MYSQLFILES=/var/lib/mysql-files
 LOGDIR=/var/log/mysql
 UPGRADEDIR=/var/lib/mysql-upgrade
 
@@ -144,6 +145,13 @@ if [ ! -d $DATADIR -a ! -L $DATADIR ]; then
  mkdir $DATADIR
 fi
 
+if [ ! -d ${MYSQLFILES} -a ! -L ${MYSQLFILES} ];
+then
+ mkdir ${MYSQLFILES}
+ chown mysql:mysql ${MYSQLFILES}
+ chmod 770 ${MYSQLFILES}
+fi
+
 # checking disc space
 if LC_ALL=C BLOCKSIZE= df --portability $DATADIR/. | tail -n 1 | awk '{ exit ($4>1000) }'; then
  echo "ERROR: There's not enough space in $DATADIR/" 1>&2

build-ps/debian/rules

@@ -90,6 +90,7 @@ ifeq ($(SKIP_DEBUG_BINARY),)
  -DWITH_FEDERATED_STORAGE_ENGINE=ON \
  -DWITH_PAM=ON \
  -DWITH_READLINE=ON \
+ -DWITH_SCALABILITY_METRICS=ON \
  -DWITH_EXTRA_CHARSETS=all ..'
 endif
 
@@ -118,6 +119,7 @@ endif
  -DWITH_FEDERATED_STORAGE_ENGINE=ON \
  -DWITH_PAM=ON \
  -DWITH_READLINE=ON \
+ -DWITH_SCALABILITY_METRICS=ON \
  -DWITH_EXTRA_CHARSETS=all ..'
 
  touch $@