← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to debian/patches/22_hppa_invalid_operands.diff

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-08-27 21:12:36 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20140827211236-se41hwfe4xy0hpef
http://bugs.debian.org/759309
http://bugs.debian.org/759813
* d/control: Removed Provides: libmysqlclient-dev (Closes: #759309)
* d/control: Removed Provides: libmysqld-dev with same motivation
* Re-introduced tha HPPA build patch as the upstream fix wasn't complete
* Fixed all kFreeBSD build and test suite issues
* Added Italian translation (Closes: #759813)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/22_hppa_invalid_operands.diff
 
1
Author: Helge Deller <deller@gmx.de>
 
2
Description: Fix build error in HPPA, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751805
 
3
 
 
4
diff --git a/storage/xtradb/os/os0stacktrace.c b/storage/xtradb/os/os0stacktrace.c
 
5
index f7fb121..18b90ea 100644
 
6
--- a/storage/xtradb/os/os0stacktrace.c
 
7
+++ b/storage/xtradb/os/os0stacktrace.c
 
8
@@ -85,7 +85,7 @@ os_stacktrace_print(
 
9
        caller_address = (void*) uc->uc_mcontext.gregs[REG_RIP] ;
 
10
 #elif defined(__hppa__)
 
11
        ucontext_t* uc = (ucontext_t*) ucontext;
 
12
-       caller_address = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0x3UL ;
 
13
+       caller_address = (void*) (uc->uc_mcontext.sc_iaoq[0] & ~0x3UL);
 
14
 #elif (defined (__ppc__)) || (defined (__powerpc__))
 
15
        ucontext_t* uc = (ucontext_t*) ucontext;
 
16
        caller_address = (void*) uc->uc_mcontext.regs->nip ;