From 5a01b19e5a39d2cc3f7fd565698edd3369885e42 Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Thu, 23 Apr 2015 19:17:35 +0200 Subject: [PATCH] gcc5 makes gcc49-aarch64 patch obsolete (and wrong) --- ...unity-mysql-5.6.19-gcc49-aarch64-opt.patch | 96 ------------------- community-mysql.spec | 7 +- 2 files changed, 4 insertions(+), 99 deletions(-) delete mode 100644 community-mysql-5.6.19-gcc49-aarch64-opt.patch diff --git a/community-mysql-5.6.19-gcc49-aarch64-opt.patch b/community-mysql-5.6.19-gcc49-aarch64-opt.patch deleted file mode 100644 index de94a31..0000000 --- a/community-mysql-5.6.19-gcc49-aarch64-opt.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -up mysql-5.6.24/storage/perfschema/pfs_account.cc.p57 mysql-5.6.24/storage/perfschema/pfs_account.cc ---- mysql-5.6.24/storage/perfschema/pfs_account.cc.p57 2015-03-25 17:34:52.000000000 +0100 -+++ mysql-5.6.24/storage/perfschema/pfs_account.cc 2015-04-09 06:53:12.383168058 +0200 -@@ -201,6 +201,13 @@ static void set_account_key(PFS_account_ - key->m_key_length= ptr - &key->m_hash_key[0]; - } - -+#if defined(__aarch64__) -+PFS_account * -+find_or_create_account(PFS_thread *thread, -+ const char *username, uint username_length, -+ const char *hostname, uint hostname_length) __attribute__((optimize (1))); -+#endif -+ - PFS_account * - find_or_create_account(PFS_thread *thread, - const char *username, uint username_length, -diff -up mysql-5.6.24/storage/perfschema/pfs_digest.cc.p57 mysql-5.6.24/storage/perfschema/pfs_digest.cc ---- mysql-5.6.24/storage/perfschema/pfs_digest.cc.p57 2015-04-09 06:53:12.386168058 +0200 -+++ mysql-5.6.24/storage/perfschema/pfs_digest.cc 2015-04-09 06:56:20.385213275 +0200 -@@ -170,6 +170,14 @@ static LF_PINS* get_digest_hash_pins(PFS - return thread->m_digest_hash_pins; - } - -+#if defined(__aarch64__) -+PFS_statement_stat* -+find_or_create_digest(PFS_thread *thread, -+ const sql_digest_storage *digest_storage, -+ const char *schema_name, -+ uint schema_name_length) __attribute__((optimize (1))); -+#endif -+ - PFS_statement_stat* - find_or_create_digest(PFS_thread *thread, - const sql_digest_storage *digest_storage, -diff -up mysql-5.6.24/storage/perfschema/pfs_host.cc.p57 mysql-5.6.24/storage/perfschema/pfs_host.cc ---- mysql-5.6.24/storage/perfschema/pfs_host.cc.p57 2015-03-25 17:34:52.000000000 +0100 -+++ mysql-5.6.24/storage/perfschema/pfs_host.cc 2015-04-09 06:53:12.386168058 +0200 -@@ -193,6 +193,11 @@ static void set_host_key(PFS_host_key *k - key->m_key_length= ptr - &key->m_hash_key[0]; - } - -+#if defined(__aarch64__) -+PFS_host *find_or_create_host(PFS_thread *thread, -+ const char *hostname, uint hostname_length) __attribute__((optimize (1))); -+#endif -+ - PFS_host *find_or_create_host(PFS_thread *thread, - const char *hostname, uint hostname_length) - { -diff -up mysql-5.6.24/storage/perfschema/pfs_instr.cc.p57 mysql-5.6.24/storage/perfschema/pfs_instr.cc ---- mysql-5.6.24/storage/perfschema/pfs_instr.cc.p57 2015-03-25 17:34:52.000000000 +0100 -+++ mysql-5.6.24/storage/perfschema/pfs_instr.cc 2015-04-09 06:53:12.388168058 +0200 -@@ -1199,6 +1199,11 @@ LF_PINS* get_filename_hash_pins(PFS_thre - @param create create a file instance if none found - @return a file instance, or NULL - */ -+#if defined(__aarch64__) -+PFS_file* -+find_or_create_file(PFS_thread *thread, PFS_file_class *klass, -+ const char *filename, uint len, bool create) __attribute__((optimize (1))); -+#endif - PFS_file* - find_or_create_file(PFS_thread *thread, PFS_file_class *klass, - const char *filename, uint len, bool create) -diff -up mysql-5.6.24/storage/perfschema/pfs_instr_class.cc.p57 mysql-5.6.24/storage/perfschema/pfs_instr_class.cc ---- mysql-5.6.24/storage/perfschema/pfs_instr_class.cc.p57 2015-03-25 17:34:52.000000000 +0100 -+++ mysql-5.6.24/storage/perfschema/pfs_instr_class.cc 2015-04-09 06:53:12.389168058 +0200 -@@ -1233,6 +1233,11 @@ static int compare_keys(PFS_table_share - @param share table share - @return a table share, or NULL - */ -+#if defined(__aarch64__) -+PFS_table_share* find_or_create_table_share(PFS_thread *thread, -+ bool temporary, -+ const TABLE_SHARE *share) __attribute__((optimize (1))); -+#endif - PFS_table_share* find_or_create_table_share(PFS_thread *thread, - bool temporary, - const TABLE_SHARE *share) -diff -up mysql-5.6.24/storage/perfschema/pfs_user.cc.p57 mysql-5.6.24/storage/perfschema/pfs_user.cc ---- mysql-5.6.24/storage/perfschema/pfs_user.cc.p57 2015-03-25 17:34:52.000000000 +0100 -+++ mysql-5.6.24/storage/perfschema/pfs_user.cc 2015-04-09 06:53:12.389168058 +0200 -@@ -193,6 +193,12 @@ static void set_user_key(PFS_user_key *k - key->m_key_length= ptr - &key->m_hash_key[0]; - } - -+#if defined(__aarch64__) -+PFS_user * -+find_or_create_user(PFS_thread *thread, -+ const char *username, uint username_length) __attribute__((optimize (1))); -+#endif -+ - PFS_user * - find_or_create_user(PFS_thread *thread, - const char *username, uint username_length) diff --git a/community-mysql.spec b/community-mysql.spec index 6712999..790b286 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -78,7 +78,7 @@ Name: community-mysql Version: 5.6.24 -Release: 2%{?with_debug:.debug}%{?dist} +Release: 3%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -127,7 +127,6 @@ Patch52: %{pkgnamepatch}-sharedir.patch Patch53: %{pkgnamepatch}-5.6.16-libmysql-version.patch Patch55: %{pkgnamepatch}-5.6.16-mysql-install.patch Patch56: %{pkgnamepatch}-pluginerrmsg.patch -Patch57: %{pkgnamepatch}-5.6.19-gcc49-aarch64-opt.patch Patch70: %{pkgnamepatch}-5.6.13-major.patch BuildRequires: cmake @@ -399,7 +398,6 @@ the MySQL sources. %patch53 -p1 %patch55 -p1 %patch56 -p1 -%patch57 -p1 %if %{with_shared_lib_major_hack} %patch70 -p1 %endif @@ -951,6 +949,9 @@ fi %endif %changelog +* Thu Apr 23 2015 Bjorn Munch - 5.6.24-3 +- gcc5 makes gcc49-aarch64 patch obsolete (and wrong) + * Fri Apr 10 2015 Honza Horak - 5.6.24-2 - Fix for big integers on gcc5