commit 71c5ff2326b02ab08d6b54daeaaab6f7f6610418 Author: Arkadiusz Miśkiewicz <ar...@maven.pl> Date: Thu Aug 24 10:15:21 2017 +0200
- up to percona 5.5.57-38.9 mysql-build.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ mysql.spec | 6 +++--- 2 files changed, 45 insertions(+), 3 deletions(-) --- diff --git a/mysql.spec b/mysql.spec index 65839d3..9315196 100644 --- a/mysql.spec +++ b/mysql.spec @@ -23,7 +23,7 @@ %bcond_with tests # FIXME: don't run correctly %bcond_with ndb # NDB is now a separate product, this here is broken, so disable it -%define percona_rel 38.5 +%define percona_rel 38.9 %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 @@ -34,14 +34,14 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql -Version: 5.5.53 +Version: 5.5.57 Release: 1 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/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz -# Source0-md5: 702ea32c4946e81542f4654c5ff5b4b5 +# Source0-md5: e3f790f9845cf3d45acd741677a47bed 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 11ef6ee..4862d2c 100644 --- a/mysql-build.patch +++ b/mysql-build.patch @@ -10,3 +10,45 @@ diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc openlog(libwrapName, LOG_PID, LOG_AUTH); #endif +From ae21683d980d5fe9e39bd0193827ea3604256eb9 Mon Sep 17 00:00:00 2001 +From: Jon Olav Hauglid <jon.haug...@oracle.com> +Date: Thu, 28 Feb 2013 14:55:23 +0100 +Subject: [PATCH] Bug#16265300: Fix new compilation warnings from XCode 4.6 + +This patch fixes three new compilation warnings generated by Clang. +It also adds -Wall flag for Clang and disables -Wnull-conversion +and -Wunused-private-field. +--- + client/mysql.cc | 4 ++-- + configure.cmake | 9 +++++++++ + sql/sql_partition.cc | 2 +- + storage/innobase/row/row0merge.cc | 4 ++-- + 4 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/client/mysql.cc b/client/mysql.cc +index eca1be0a623..f6a75f47043 100644 +--- a/client/mysql.cc ++++ b/client/mysql.cc +@@ -2911,7 +2911,7 @@ You can turn off this feature to get a quicker startup with -A\n\n"); + mysql_free_result(fields); + break; + } +- field_names[i][num_fields*2]= '\0'; ++ field_names[i][num_fields*2]= NULL; + j=0; + while ((sql_field=mysql_fetch_field(fields))) + { +diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc +index 201f64522a6..e23fe70ec86 100644 +--- a/sql/sql_partition.cc ++++ b/sql/sql_partition.cc +@@ -284,7 +284,7 @@ bool partition_default_handling(TABLE *table, partition_info *part_info, + } + } + part_info->set_up_defaults_for_partitioning(table->file, +- (ulonglong)0, (uint)0); ++ NULL, 0U); + DBUG_RETURN(FALSE); + } + + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/71c5ff2326b02ab08d6b54daeaaab6f7f6610418 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit