[Commits] Rev 91: MBug#509535: MariaDB .debs should link system libs, not bundled. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Nov 22 00:47:36 EET 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1

------------------------------------------------------------
revno: 91
revision-id: knielsen at knielsen-hq.org-20101121224735-1kpbf2fpjpm9spat
parent: knielsen at knielsen-hq.org-20101120085848-3isnw6nw6ji1xwqe
committer: knielsen at knielsen-hq.org
branch nick: ourdelta-bugfix
timestamp: Sun 2010-11-21 23:47:35 +0100
message:
  MBug#509535: MariaDB .debs should link system libs, not bundled.
  MBug#675185: dash bug causes mysqld_safe to spin at 100% CPU
=== modified file 'bakery/debian-5.1/dist/Debian/rules'
--- a/bakery/debian-5.1/dist/Debian/rules	2010-05-17 08:23:54 +0000
+++ b/bakery/debian-5.1/dist/Debian/rules	2010-11-21 22:47:35 +0000
@@ -106,10 +106,10 @@ endif
                 --without-docs \
                 --with-extra-charsets=all \
                 --with-libwrap \
-                --with-ssl \
-                --with-libevent \
-                --with-readline \
-                --with-zlib-dir=bundled \
+                --with-ssl=/usr \
+                --with-libevent=/usr \
+                --without-readline # "without bundled", use system libreadline \
+                --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \
                 --with-plugins=max-no-ndb \

=== modified file 'bakery/debian-5.1/dist/Ubuntu/rules'
--- a/bakery/debian-5.1/dist/Ubuntu/rules	2010-05-17 08:23:54 +0000
+++ b/bakery/debian-5.1/dist/Ubuntu/rules	2010-11-21 22:47:35 +0000
@@ -107,10 +107,10 @@ endif
                 --without-docs \
                 --with-extra-charsets=all \
                 --with-libwrap \
-                --with-ssl \
-                --with-libevent \
-                --with-readline \
-                --with-zlib-dir=bundled \
+                --with-ssl=/usr \
+                --with-libevent=/usr \
+                --without-readline # "without bundled", use system libreadline \
+                --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \
                 --with-plugins=max-no-ndb \

=== modified file 'bakery/debian-5.1/patches/00list'
--- a/bakery/debian-5.1/patches/00list	2009-10-23 07:27:11 +0000
+++ b/bakery/debian-5.1/patches/00list	2010-11-21 22:47:35 +0000
@@ -8,3 +8,4 @@
 44_scripts__mysql_config__libs.dpatch
 50_mysql-test__db_test.dpatch
 # 60_zlib_innodb_workaround.dpatch
+61_replace_dash_with_bash_mbug675185.dpatch

=== added file 'bakery/debian-5.1/patches/61_replace_dash_with_bash_mbug675185.dpatch'
--- a/bakery/debian-5.1/patches/61_replace_dash_with_bash_mbug675185.dpatch	1970-01-01 00:00:00 +0000
+++ b/bakery/debian-5.1/patches/61_replace_dash_with_bash_mbug675185.dpatch	2010-11-21 22:47:35 +0000
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 61_replace_dash_with_bash_mbug675185.dpatch by  <knielsen at knielsen-hq.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: 61_replace_dash_with_bash_mbug675185
+## DP: A race in dash causes mysqld_safe to occasionally loop infinitely.
+## DP: Fix by using bash instead.
+## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185
+
+ at DPATCH@
+=== modified file 'scripts/mysqld_safe.sh'
+--- old/scripts/mysqld_safe.sh  2010-04-09 11:47:18 +0000
++++ new/scripts/mysqld_safe.sh  2010-11-21 09:40:50 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
+ # This file is public domain and comes with NO WARRANTY of any kind
+ #
+

=== modified file 'bakery/debian-5.2/dist/Debian/rules'
--- a/bakery/debian-5.2/dist/Debian/rules	2010-05-17 08:23:54 +0000
+++ b/bakery/debian-5.2/dist/Debian/rules	2010-11-21 22:47:35 +0000
@@ -106,10 +106,10 @@ endif
                 --without-docs \
                 --with-extra-charsets=all \
                 --with-libwrap \
-                --with-ssl \
-                --with-libevent \
-                --with-readline \
-                --with-zlib-dir=bundled \
+                --with-ssl=/usr \
+                --with-libevent=/usr \
+                --without-readline # "without bundled", use system libreadline \
+                --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \
                 --with-plugins=max-no-ndb \

=== modified file 'bakery/debian-5.2/dist/Ubuntu/rules'
--- a/bakery/debian-5.2/dist/Ubuntu/rules	2010-05-17 08:23:54 +0000
+++ b/bakery/debian-5.2/dist/Ubuntu/rules	2010-11-21 22:47:35 +0000
@@ -107,10 +107,10 @@ endif
                 --without-docs \
                 --with-extra-charsets=all \
                 --with-libwrap \
-                --with-ssl \
-                --with-libevent \
-                --with-readline \
-                --with-zlib-dir=bundled \
+                --with-ssl=/usr \
+                --with-libevent=/usr \
+                --without-readline # "without bundled", use system libreadline \
+                --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \
                 --with-plugins=max-no-ndb \

=== modified file 'bakery/debian-5.2/patches/00list'
--- a/bakery/debian-5.2/patches/00list	2010-03-11 04:27:08 +0000
+++ b/bakery/debian-5.2/patches/00list	2010-11-21 22:47:35 +0000
@@ -8,3 +8,4 @@
 44_scripts__mysql_config__libs.dpatch
 50_mysql-test__db_test.dpatch
 # 60_zlib_innodb_workaround.dpatch
+61_replace_dash_with_bash_mbug675185.dpatch

=== added file 'bakery/debian-5.2/patches/61_replace_dash_with_bash_mbug675185.dpatch'
--- a/bakery/debian-5.2/patches/61_replace_dash_with_bash_mbug675185.dpatch	1970-01-01 00:00:00 +0000
+++ b/bakery/debian-5.2/patches/61_replace_dash_with_bash_mbug675185.dpatch	2010-11-21 22:47:35 +0000
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 61_replace_dash_with_bash_mbug675185.dpatch by  <knielsen at knielsen-hq.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: 61_replace_dash_with_bash_mbug675185
+## DP: A race in dash causes mysqld_safe to occasionally loop infinitely.
+## DP: Fix by using bash instead.
+## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185
+
+ at DPATCH@
+=== modified file 'scripts/mysqld_safe.sh'
+--- old/scripts/mysqld_safe.sh  2010-04-09 11:47:18 +0000
++++ new/scripts/mysqld_safe.sh  2010-11-21 09:40:50 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
+ # This file is public domain and comes with NO WARRANTY of any kind
+ #
+

=== modified file 'bakery/debian-5.3/dist/Debian/rules'
--- a/bakery/debian-5.3/dist/Debian/rules	2010-11-01 08:23:55 +0000
+++ b/bakery/debian-5.3/dist/Debian/rules	2010-11-21 22:47:35 +0000
@@ -106,10 +106,10 @@ endif
                 --without-docs \
                 --with-extra-charsets=all \
                 --with-libwrap \
-                --with-ssl \
-                --with-libevent \
-                --with-readline \
-                --with-zlib-dir=bundled \
+                --with-ssl=/usr \
+                --with-libevent=/usr \
+                --without-readline # "without bundled", use system libreadline \
+                --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \
                 --with-plugins=max-no-ndb \

=== modified file 'bakery/debian-5.3/dist/Ubuntu/rules'
--- a/bakery/debian-5.3/dist/Ubuntu/rules	2010-11-01 08:23:55 +0000
+++ b/bakery/debian-5.3/dist/Ubuntu/rules	2010-11-21 22:47:35 +0000
@@ -107,10 +107,10 @@ endif
                 --without-docs \
                 --with-extra-charsets=all \
                 --with-libwrap \
-                --with-ssl \
-                --with-libevent \
-                --with-readline \
-                --with-zlib-dir=bundled \
+                --with-ssl=/usr \
+                --with-libevent=/usr \
+                --without-readline # "without bundled", use system libreadline \
+                --with-zlib-dir=/usr \
                 --with-embedded-server \
                 --with-embedded-privilege-control \
                 --with-plugins=max-no-ndb \

=== modified file 'bakery/debian-5.3/patches/00list'
--- a/bakery/debian-5.3/patches/00list	2010-11-01 08:23:55 +0000
+++ b/bakery/debian-5.3/patches/00list	2010-11-21 22:47:35 +0000
@@ -8,3 +8,4 @@
 44_scripts__mysql_config__libs.dpatch
 50_mysql-test__db_test.dpatch
 # 60_zlib_innodb_workaround.dpatch
+61_replace_dash_with_bash_mbug675185.dpatch

=== added file 'bakery/debian-5.3/patches/61_replace_dash_with_bash_mbug675185.dpatch'
--- a/bakery/debian-5.3/patches/61_replace_dash_with_bash_mbug675185.dpatch	1970-01-01 00:00:00 +0000
+++ b/bakery/debian-5.3/patches/61_replace_dash_with_bash_mbug675185.dpatch	2010-11-21 22:47:35 +0000
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 61_replace_dash_with_bash_mbug675185.dpatch by  <knielsen at knielsen-hq.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: 61_replace_dash_with_bash_mbug675185
+## DP: A race in dash causes mysqld_safe to occasionally loop infinitely.
+## DP: Fix by using bash instead.
+## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185
+
+ at DPATCH@
+=== modified file 'scripts/mysqld_safe.sh'
+--- old/scripts/mysqld_safe.sh  2010-04-09 11:47:18 +0000
++++ new/scripts/mysqld_safe.sh  2010-11-21 09:40:50 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
+ # This file is public domain and comes with NO WARRANTY of any kind
+ #
+



More information about the commits mailing list