Merge branch 'mysql-5.6' into mysql-5.7

Author: ltangvald

packaging/deb-in/CMakeLists.txt

@@ -37,6 +37,15 @@ ELSE()
   SET (DEB_CONTROL_SERVER_CONFLICT_NDB "mysql-cluster-community-server, mysql-cluster-commercial-server")
   SET (DEB_CONTROL_CLIENT_CONFLICT_NDB "mysql-cluster-community-client, mysql-cluster-commercial-client")
 ENDIF()
+# Timestamp for use in debian/changelog
+IF (NOT DEFINED DEB_CHANGELOG_TIMESTAMP)
+  execute_process(
+    COMMAND date --rfc-2822
+    OUTPUT_VARIABLE DEB_CHANGELOG_TIMESTAMP
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  SET (DEB_CHANGELOG_TIMESTAMP ${DEB_CHANGELOG_TIMESTAMP} CACHE STRING "")
+ENDIF()
 # Commercial or community
 IF (DEB_PRODUCT STREQUAL "commercial")
   SET (DEB_COPYRIGHT_UPSTREAMNAME "MySQL Commercial Server ${MYSQL_BASE_VERSION}")

packaging/deb-in/changelog.in

@@ -1,37 +1,9 @@
 mysql-@DEB_PRODUCTNAME@ (@DEB_SERVERVERSION@@DEB_PLATFORMRELEASE@) @DEB_CODENAME@; urgency=low
 
-  [ Akhil Mohan ]
-  * new upstream release
-  * Added new libtest_* plugins to source/include-binaries, mysql-*-test.install
-  * added new plugin to source/include-binaries, mysql-*-test.install
-    libtest_framework
-    libtest_services
-    libtest_services_threaded
-    locking_service
-    test_security_context
-    version_token
-  * added support for MECAB in
-    d/{control,rules,mysql-*-server.install,source/include-binaries}
-    (Closes: #20315007)
-  * added automatic setup of ssl certs in
-    d/mysql-*-server.mysql.init
-    d/extra/mysql-systemd-start
-    (Closes: #20650118)
-  * removed pkg mysql-*-bench; sqlbench will not be packaged
-    (Closes: #21303289)
-  * removed cleanup statement for client lib symlinks *_r in d/rules
-    (Closes: #21311067)
-
-  [ Balasubramanian Kandasamy ]
-  * Added mysqlpump man page to d/mysql-*-client.install
-  * Added new decompression utilities lz4_decompress and zlib_decompress
-    binaries.
-  * Added mysqlx plugin
-
-  [ Lars Tangvald ]
-  * Added keyring directory and plugin
-
- -- Balasubramanian Kandasamy <[email protected]>  Wed, 26 Aug 2015 15:20:12 +0530
+  * New Release. For release notes, please refer to
+    https://dev.mysql.com/doc/relnotes/mysql/@MYSQL_BASE_VERSION@/en/news-@MAJOR_VERSION@-@MINOR_VERSION@-@[email protected]
+
+ -- MySQL Release Engineering <[email protected]>  @DEB_CHANGELOG_TIMESTAMP@
 
 mysql-@DEB_PRODUCTNAME@ (5.7.7-rc-3ubuntu15.04) vivid; urgency=low