hhorak pushed to community-mysql (f21). "Update to 5.6.24 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 9 05:13:16 UTC 2015 

>From f15e83f4c27e296c7c6554ab571f84e2300a4171 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak at redhat.com>
Date: Thu, 9 Apr 2015 06:59:20 +0200
Subject: Update to 5.6.24

Conflicts:
	community-mysql.spec

diff --git a/.gitignore b/.gitignore
index edb3682..080d064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /mysql-5.6.20.tar.gz
 /mysql-5.6.21.tar.gz
 /mysql-5.6.23.tar.gz
+/mysql-5.6.24.tar.gz
diff --git a/community-mysql-5.6.19-gcc49-aarch64-opt.patch b/community-mysql-5.6.19-gcc49-aarch64-opt.patch
index ed3e295..de94a31 100644
--- a/community-mysql-5.6.19-gcc49-aarch64-opt.patch
+++ b/community-mysql-5.6.19-gcc49-aarch64-opt.patch
@@ -1,8 +1,7 @@
-diff --git a/storage/perfschema/pfs_account.cc b/storage/perfschema/pfs_account.cc
-index 405364a..ed3bef1 100644
---- a/storage/perfschema/pfs_account.cc
-+++ b/storage/perfschema/pfs_account.cc
-@@ -201,6 +201,13 @@ static void set_account_key(PFS_account_key *key,
+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];
  }
  
@@ -16,30 +15,28 @@ index 405364a..ed3bef1 100644
  PFS_account *
  find_or_create_account(PFS_thread *thread,
                           const char *username, uint username_length,
-diff --git a/storage/perfschema/pfs_digest.cc b/storage/perfschema/pfs_digest.cc
-index addfac1..68e76cd 100644
---- a/storage/perfschema/pfs_digest.cc
-+++ b/storage/perfschema/pfs_digest.cc
-@@ -168,6 +168,14 @@ static LF_PINS* get_digest_hash_pins(PFS_thread *thread)
+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,
-+                      PSI_digest_storage *digest_storage,
++                      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,
-                       PSI_digest_storage *digest_storage,
-diff --git a/storage/perfschema/pfs_host.cc b/storage/perfschema/pfs_host.cc
-index 0c6f5cf..fc624d7 100644
---- a/storage/perfschema/pfs_host.cc
-+++ b/storage/perfschema/pfs_host.cc
-@@ -193,6 +193,11 @@ static void set_host_key(PFS_host_key *key,
+                       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];
  }
  
@@ -51,11 +48,10 @@ index 0c6f5cf..fc624d7 100644
  PFS_host *find_or_create_host(PFS_thread *thread,
                                const char *hostname, uint hostname_length)
  {
-diff --git a/storage/perfschema/pfs_instr.cc b/storage/perfschema/pfs_instr.cc
-index cf0e6fd..8682e04 100644
---- a/storage/perfschema/pfs_instr.cc
-+++ b/storage/perfschema/pfs_instr.cc
-@@ -1149,6 +1149,11 @@ LF_PINS* get_filename_hash_pins(PFS_thread *thread)
+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
  */
@@ -67,11 +63,10 @@ index cf0e6fd..8682e04 100644
  PFS_file*
  find_or_create_file(PFS_thread *thread, PFS_file_class *klass,
                      const char *filename, uint len, bool create)
-diff --git a/storage/perfschema/pfs_instr_class.cc b/storage/perfschema/pfs_instr_class.cc
-index 4d73396..139a2db 100644
---- a/storage/perfschema/pfs_instr_class.cc
-+++ b/storage/perfschema/pfs_instr_class.cc
-@@ -1233,6 +1233,11 @@ static int compare_keys(PFS_table_share *pfs, const TABLE_SHARE *share)
+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
  */
@@ -83,11 +78,10 @@ index 4d73396..139a2db 100644
  PFS_table_share* find_or_create_table_share(PFS_thread *thread,
                                              bool temporary,
                                              const TABLE_SHARE *share)
-diff --git a/storage/perfschema/pfs_user.cc b/storage/perfschema/pfs_user.cc
-index 9f53702..2f418a7 100644
---- a/storage/perfschema/pfs_user.cc
-+++ b/storage/perfschema/pfs_user.cc
-@@ -193,6 +193,12 @@ static void set_user_key(PFS_user_key *key,
+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];
  }
  
diff --git a/community-mysql.spec b/community-mysql.spec
index 8e6f37f..7a122ea 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -64,7 +64,7 @@
 %global sameevr   %{?epoch:%{epoch}:}%{version}-%{release}
 
 Name:             %{pkgname}
-Version:          5.6.23
+Version:          5.6.24
 Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 Group:            Applications/Databases
@@ -920,6 +920,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 09 2015 Honza Horak <hhorak at redhat.com> - 5.6.24-1
+- Update to 5.6.24
+
 * Mon Jan 26 2015 Bjorn Munch <bjorn.munch at oracle.com> - 5.6.23-1
 - Update to MySQL 5.6.23, for various fixes described at
   https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-23.html
diff --git a/sources b/sources
index 13cbdde..81ca628 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60344f26eae136a267a0277407926e79  mysql-5.6.23.tar.gz
+68e1911f70eb1b02170d4f96bf0f0f88  mysql-5.6.24.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/community-mysql.git/commit/?h=f21&id=f15e83f4c27e296c7c6554ab571f84e2300a4171

More information about the scm-commits mailing list