[Pkg-mysql-commits] [mariadb-5.5] 01/01: Re-introduce HPPA fix, upstream fix wasn't complete

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit b716bc227d0a484409e9a4b07833f170536d8bf5
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Fri Aug 29 10:35:52 2014 +0300

    Re-introduce HPPA fix, upstream fix wasn't complete
---
 debian/patches/22_hppa_invalid_operands.diff             | 16 ++++++++++++++++
 .../33_scripts__mysql_create_system_tables__no_test.diff |  0
 debian/patches/38_scripts__mysqld_safe.sh__signals.diff  |  0
 .../41_scripts__mysql_install_db.sh__no_test.diff        |  0
 debian/patches/44_scripts__mysql_config__libs.diff       |  0
 debian/patches/50_mysql-test__db_test.diff               |  0
 debian/patches/61_replace_dash_with_bash_mbug675185.diff |  0
 .../99_remove_rename_mariadb-server_files_in.diff        |  0
 debian/patches/series                                    |  1 +
 9 files changed, 17 insertions(+)

diff --git a/debian/patches/22_hppa_invalid_operands.diff b/debian/patches/22_hppa_invalid_operands.diff
new file mode 100644
index 0000000..3225d22
--- /dev/null
+++ b/debian/patches/22_hppa_invalid_operands.diff
@@ -0,0 +1,16 @@
+Author: Helge Deller <deller at gmx.de>
+Description: Fix build error in HPPA, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751805
+
+diff --git a/storage/xtradb/os/os0stacktrace.c b/storage/xtradb/os/os0stacktrace.c
+index f7fb121..18b90ea 100644
+--- a/storage/xtradb/os/os0stacktrace.c
++++ b/storage/xtradb/os/os0stacktrace.c
+@@ -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] & ~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 ;
diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff b/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.diff b/debian/patches/38_scripts__mysqld_safe.sh__signals.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff b/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/44_scripts__mysql_config__libs.diff b/debian/patches/44_scripts__mysql_config__libs.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/50_mysql-test__db_test.diff b/debian/patches/50_mysql-test__db_test.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/61_replace_dash_with_bash_mbug675185.diff b/debian/patches/61_replace_dash_with_bash_mbug675185.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/99_remove_rename_mariadb-server_files_in.diff b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/series b/debian/patches/series
index 0a8da2e..6dcfe0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 20_kfreebsd_tests.diff
 21_kfreebsd-peercred.diff
+22_hppa_invalid_operands.diff
 33_scripts__mysql_create_system_tables__no_test.diff
 38_scripts__mysqld_safe.sh__signals.diff
 41_scripts__mysql_install_db.sh__no_test.diff

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git