[packages/mysql/MYSQL_5_6] - up to 5.6.38-83.0

arekm arekm at pld-linux.org
Sat Dec 9 21:54:36 CET 2017


commit 373bcfdaec806151e261383427dd0425d92fb102
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Dec 9 21:54:28 2017 +0100

    - up to 5.6.38-83.0

 mysql-build.patch | 43 -------------------------------------------
 mysql.spec        |  8 ++++----
 2 files changed, 4 insertions(+), 47 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index fde318f..7af41ff 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -30,8 +30,8 @@
 %undefine	with_tokudb
 %endif
 
-%define		rel	2
-%define		percona_rel	82.2
+%define		rel	1
+%define		percona_rel	83.0
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
@@ -42,14 +42,14 @@ Summary(ru.UTF-8):	MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
-Version:	5.6.37
+Version:	5.6.38
 Release:	%{percona_rel}.%{rel}
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
 # Source0:	http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
 Source0:	http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5:	625735e83143b4ae0bb038289168fba1
+# Source0-md5:	bbb8a8b5583409beb81f4c4efda53d9c
 Source100:	http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:	5cac34f3d78a9d612ca4301abfcbd666
 Source1:	%{name}.init
diff --git a/mysql-build.patch b/mysql-build.patch
index b1230f8..57ca277 100644
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -59,47 +59,4 @@
  
  set(USE_VALGRIND OFF CACHE BOOL "whether to use valgrind headers")
  if (USE_VALGRIND)
---- percona-server-5.6.37-82.2/sql-common/client_authentication.cc~	2017-08-24 13:30:44.000000000 +0200
-+++ percona-server-5.6.37-82.2/sql-common/client_authentication.cc	2017-10-10 07:08:19.782991745 +0200
-@@ -83,8 +83,7 @@ RSA *rsa_init(MYSQL *mysql)
-   FILE *pub_key_file= NULL;
- 
-   if (mysql->options.extension != NULL &&
--      mysql->options.extension->server_public_key_path != NULL &&
--      mysql->options.extension->server_public_key_path != '\0')
-+      mysql->options.extension->server_public_key_path != NULL)
-   {
-     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
-                         "r");
 
---- percona-server-5.6.37-82.2/storage/innobase/include/page0zip.ic~	2017-08-24 13:30:44.000000000 +0200
-+++ percona-server-5.6.37-82.2/storage/innobase/include/page0zip.ic	2017-10-11 12:27:12.098125815 +0200
-@@ -172,7 +172,7 @@ page_zip_rec_needs_ext(
- 				ignored if zip_size == 0 */
- 	ulint	zip_size)	/*!< in: compressed page size in bytes, or 0 */
- {
--	ut_ad(rec_size > comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES);
-+	ut_ad(rec_size > (comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES));
- 	ut_ad(ut_is_2pow(zip_size));
- 	ut_ad(comp || !zip_size);
- 
---- percona-server-5.6.37-82.2/sql/log_event.cc~	2017-08-24 13:30:44.000000000 +0200
-+++ percona-server-5.6.37-82.2/sql/log_event.cc	2017-10-11 12:48:39.034505850 +0200
-@@ -7839,7 +7839,7 @@ User_var_log_event(const char* buf, uint
- #ifndef DBUG_OFF
-     bool old_pre_checksum_fd= description_event->is_version_before_checksum();
- #endif
--    DBUG_ASSERT((bytes_read == data_written -
-+    DBUG_ASSERT((bytes_read == (data_written -
-                  (old_pre_checksum_fd ||
-                   (description_event->checksum_alg ==
-                    BINLOG_CHECKSUM_ALG_OFF)) ?
-@@ -7849,7 +7849,7 @@ User_var_log_event(const char* buf, uint
-                  (old_pre_checksum_fd ||
-                   (description_event->checksum_alg ==
-                    BINLOG_CHECKSUM_ALG_OFF)) ?
--                 0 : BINLOG_CHECKSUM_LEN));
-+                 0 : BINLOG_CHECKSUM_LEN)));
-     if ((data_written - bytes_read) > 0)
-     {
-       flags= (uint) *(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE +
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/373bcfdaec806151e261383427dd0425d92fb102



More information about the pld-cvs-commit mailing list