Bug#751805: mariadb-5.5 FTBFS, patch for hppa architecture attached

[Helge Deller]

Package: mariadb-5.5
Version: 5.5.37
Severity: bug
Tags: patch

mariadb-5.5 fails to build on the hppa architecture with the error shown below.
Full log is here: 
http://buildd.debian-ports.org/status/fetch.php?pkg=mariadb-5.5&arch=hppa&ver=5.5.37-1&stamp=1398613170

The attached trivial patch (which touches only hppa coding!) fixes the build.
Please apply for the next version.

Thanks,
Helge

This is the error without the patch:
/«PKGBUILDDIR»/storage/xtradb/os/os0stacktrace.c: In function 
'os_stacktrace_print':
/«PKGBUILDDIR»/storage/xtradb/os/os0stacktrace.c:88:2: error: stray '\303' in 
program
  caller_address = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0×3UL ;
  ^
/«PKGBUILDDIR»/storage/xtradb/os/os0stacktrace.c:88:2: error: stray '\227' in 
program
/«PKGBUILDDIR»/storage/xtradb/os/os0stacktrace.c:88:54: error: invalid operands 
to binary & (have 'void *' and 'int')
  caller_address = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0×3UL ;
                                                      ^
/«PKGBUILDDIR»/storage/xtradb/os/os0stacktrace.c:88:60: error: expected ';' 
before numeric constant
  caller_address = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0×3UL ;
                                                            ^
make[4]: *** [storage/xtradb/CMakeFiles/xtradb.dir/os/os0stacktrace.c.o] Error 1

diff -up ./storage/xtradb/os/os0stacktrace.c.org ./storage/xtradb/os/os0stacktrace.c
--- ./storage/xtradb/os/os0stacktrace.c.org	2014-06-16 16:19:31.288965684 +0200
+++ ./storage/xtradb/os/os0stacktrace.c	2014-06-16 17:16:44.210474810 +0200
@@ -85,7 +85,7 @@ os_stacktrace_print(
 	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] & ~0×3UL ;
+	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 ;