diff options
author | Brian Evans <grknight@tuffmail.com> | 2014-08-17 19:31:39 -0400 |
---|---|---|
committer | Brian Evans <grknight@tuffmail.com> | 2014-08-17 19:31:39 -0400 |
commit | 22bf230ec6ebf561d6dc9eeb9f9209c9746f7d57 (patch) | |
tree | b9827c9bd6f526f9e8339625420cad66d095d51a | |
parent | Fix bad comparision of void to ulong on hppa (diff) | |
download | mysql-extras-22bf230ec6ebf561d6dc9eeb9f9209c9746f7d57.tar.gz mysql-extras-22bf230ec6ebf561d6dc9eeb9f9209c9746f7d57.tar.bz2 mysql-extras-22bf230ec6ebf561d6dc9eeb9f9209c9746f7d57.zip |
Fix bad comparision of void to ulong on hppa for 10.0.13mysql-extras-20140817-2331Z
-rw-r--r-- | 00000_index.txt | 5 | ||||
-rw-r--r-- | 20011_all_mariadb-hppa-unsigned-long-10.0.13.patch | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/00000_index.txt b/00000_index.txt index 425ec04..eb30088 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1716,6 +1716,11 @@ @patch 20011_all_mariadb-hppa-unsigned-long.patch @ver 5.05.39.00 to 5.05.99.99 +@pn mariadb +@@ Fix bad comparision of void to ulong +@@ Gentoo bug 520092 MDEV-6595 + +@patch 20011_all_mariadb-hppa-unsigned-long-10.0.13.patch @ver 10.00.13.00 to 10.00.99.99 @pn mariadb @@ Fix bad comparision of void to ulong diff --git a/20011_all_mariadb-hppa-unsigned-long-10.0.13.patch b/20011_all_mariadb-hppa-unsigned-long-10.0.13.patch new file mode 100644 index 0000000..b076f05 --- /dev/null +++ b/20011_all_mariadb-hppa-unsigned-long-10.0.13.patch @@ -0,0 +1,11 @@ +--- a/storage/xtradb/os/os0stacktrace.cc ++++ b/storage/xtradb/os/os0stacktrace.cc +@@ -85,7 +85,7 @@ + caller_address = (void*) uc->uc_mcontext.gregs[REG_RIP] ; + #elif defined(__hppa__) + ucontext_t* uc = (ucontext_t*) ucontext; +- caller_address = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0x3UL ; ++ caller_address = (void*) (uc->uc_mcontext.sc_iaoq[0] & ~0x3UL) ; + #elif (defined (__ppc__)) || (defined (__powerpc__)) + ucontext_t* uc = (ucontext_t*) ucontext; + caller_address = (void*) uc->uc_mcontext.regs->nip ; |