diff options
author | Brian Evans <grknight@tuffmail.com> | 2014-08-17 19:16:01 -0400 |
---|---|---|
committer | Brian Evans <grknight@tuffmail.com> | 2014-08-17 19:19:22 -0400 |
commit | ddbb7641cebcbf956e6cc58cd81372be3d2f257a (patch) | |
tree | 36339f6027ea301942e5a993fa57f8a333608945 | |
parent | Fix minimal builds on MariaDB 10.0.13 (diff) | |
download | mysql-extras-ddbb7641cebcbf956e6cc58cd81372be3d2f257a.tar.gz mysql-extras-ddbb7641cebcbf956e6cc58cd81372be3d2f257a.tar.bz2 mysql-extras-ddbb7641cebcbf956e6cc58cd81372be3d2f257a.zip |
Fix bad comparision of void to ulong on hppamysql-extras-20140817-2320Z
-rw-r--r-- | 00000_index.txt | 7 | ||||
-rw-r--r-- | 20011_all_mariadb-hppa-unsigned-long.patch | 11 |
2 files changed, 18 insertions, 0 deletions
diff --git a/00000_index.txt b/00000_index.txt index c184471..425ec04 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1713,3 +1713,10 @@ @ver 5.01.73.00 to 5.01.99.99 @pn mysql @@ Fix Bison 3 compatibility + +@patch 20011_all_mariadb-hppa-unsigned-long.patch +@ver 5.05.39.00 to 5.05.99.99 +@ver 10.00.13.00 to 10.00.99.99 +@pn mariadb +@@ Fix bad comparision of void to ulong +@@ Gentoo bug 520092 MDEV-6595 diff --git a/20011_all_mariadb-hppa-unsigned-long.patch b/20011_all_mariadb-hppa-unsigned-long.patch new file mode 100644 index 0000000..5f5b841 --- /dev/null +++ b/20011_all_mariadb-hppa-unsigned-long.patch @@ -0,0 +1,11 @@ +--- a/storage/xtradb/os/os0stacktrace.c ++++ b/storage/xtradb/os/os0stacktrace.c +@@ -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 ; |