From 88e426548a72a710de0393798a836f8e294f4b1f Mon Sep 17 00:00:00 2001 From: cvs2git Date: Fri, 13 Oct 2006 12:05:43 +0000 Subject: [PATCH 1/1] This commit was manufactured by cvs2git to create branch 'MYSQL_4_1'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Cherrypick from master 2006-05-09 18:25:16 UTC Elan Ruusamäe '- PLD paths': mysql.monitrc -> 1.3 mysql.sysconfig -> 1.13 Cherrypick from master 2006-10-13 12:05:43 UTC Arkadiusz Miśkiewicz '- fix alpha build (qboosh)': mysql-alpha.patch -> 1.3 Cherrypick from unlabeled-1.10.2 2006-05-04 19:42:01 UTC Elan Ruusamäe '- update to 4.1.19 (or did upstream got it right this time?)': mysql-libs.patch -> 1.10.2.1 --- mysql-alpha.patch | 35 ++++++++++++++++++++++++++++++++ mysql-libs.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++ mysql.monitrc | 23 +++++++++++++++++++++ mysql.sysconfig | 21 +++++++++++++++++++ 4 files changed, 130 insertions(+) create mode 100644 mysql-alpha.patch create mode 100644 mysql-libs.patch create mode 100644 mysql.monitrc create mode 100644 mysql.sysconfig diff --git a/mysql-alpha.patch b/mysql-alpha.patch new file mode 100644 index 0000000..31f1195 --- /dev/null +++ b/mysql-alpha.patch @@ -0,0 +1,35 @@ +diff -urbB mysql-5.0.15.org/ndb/src/kernel/blocks/dbtc/Makefile.am mysql-5.0.15/ndb/src/kernel/blocks/dbtc/Makefile.am +--- mysql-5.0.15.org/ndb/src/kernel/blocks/dbtc/Makefile.am 2005-10-17 03:27:27.000000000 +0200 ++++ mysql-5.0.15/ndb/src/kernel/blocks/dbtc/Makefile.am 2005-10-25 15:15:29.000000000 +0200 +@@ -1,5 +1,7 @@ + noinst_LIBRARIES = libdbtc.a + ++CXXFLAGS += -O0 ++ + libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp + + include $(top_srcdir)/ndb/config/common.mk.am +diff -urN mysql-5.0.26.org/libmysqld/stacktrace.c mysql-5.0.26/libmysqld/stacktrace.c +--- mysql-5.0.26.org/libmysqld/stacktrace.c 2006-10-04 13:24:21.000000000 +0200 ++++ mysql-5.0.26/libmysqld/stacktrace.c 2006-10-13 14:03:32.000000000 +0200 +@@ -186,7 +186,7 @@ + + #if defined(__alpha__) && defined(__GNUC__) + uchar** new_fp = find_prev_fp(pc, fp); +- if (frame_count == SIGRETURN_FRAME_COUNT - 1) ++ if (frame_count == sigreturn_frame_count - 1) + { + new_fp += 90; + } +diff -urN mysql-5.0.26.org/sql/stacktrace.c mysql-5.0.26/sql/stacktrace.c +--- mysql-5.0.26.org/sql/stacktrace.c 2006-10-04 13:24:21.000000000 +0200 ++++ mysql-5.0.26/sql/stacktrace.c 2006-10-13 14:03:32.000000000 +0200 +@@ -186,7 +186,7 @@ + + #if defined(__alpha__) && defined(__GNUC__) + uchar** new_fp = find_prev_fp(pc, fp); +- if (frame_count == SIGRETURN_FRAME_COUNT - 1) ++ if (frame_count == sigreturn_frame_count - 1) + { + new_fp += 90; + } diff --git a/mysql-libs.patch b/mysql-libs.patch new file mode 100644 index 0000000..7b8120a --- /dev/null +++ b/mysql-libs.patch @@ -0,0 +1,51 @@ +--- mysql-4.1.19/configure.in~ 2006-05-04 22:37:01.424363499 +0300 ++++ mysql-4.1.19/configure.in 2006-05-04 22:39:56.658291086 +0300 +@@ -817,18 +817,20 @@ + + AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) + +-AC_CHECK_LIB(nsl_r, gethostbyname_r, [], +- AC_CHECK_LIB(nsl, gethostbyname_r)) +-AC_CHECK_FUNC(gethostbyname_r) ++AC_CHECK_FUNC(gethostbyname_r, [], ++ [AC_CHECK_LIB(nsl_r, gethostbyname_r, [], ++ [AC_CHECK_LIB(nsl, gethostbyname_r)])]) + + AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) +-AC_CHECK_FUNC(yp_get_default_domain, , +- AC_CHECK_LIB(nsl, yp_get_default_domain)) + AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) + # This may get things to compile even if bind-8 is installed + AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) + # Check if crypt() exists in libc or libcrypt, sets LIBS if needed +-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) ++save_LIBS="$LIBS" ++AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"]) ++AC_SUBST(LIBCRYPT) ++AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) ++LIBS="$save_LIBS" + + # For sem_xxx functions on Solaris 2.6 + AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) +--- mysql-4.1.7.org/libmysql_r/Makefile.am 2004-10-27 01:35:55.265121136 +0200 ++++ mysql-4.1.7/libmysql_r/Makefile.am 2004-10-27 01:36:23.574817408 +0200 +@@ -33,7 +33,7 @@ + libmysql_dir = $(top_srcdir)/libmysql + + libmysqlclient_r_la_SOURCES = $(target_sources) +-libmysqlclient_r_la_LIBADD = $(target_libadd) ++libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread + libmysqlclient_r_la_LDFLAGS = $(target_ldflags) + + # This is called from the toplevel makefile +--- mysql-4.1.7.org/sql/Makefile.am 2004-10-27 01:35:55.971013824 +0200 ++++ mysql-4.1.7/sql/Makefile.am 2004-10-27 01:37:07.260176224 +0200 +@@ -43,7 +43,7 @@ + @bdb_libs@ @innodb_libs@ @pstack_libs@ \ + @innodb_system_libs@ \ + @ndbcluster_libs@ @ndbcluster_system_libs@ \ +- $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ ++ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@ + noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ + item_strfunc.h item_timefunc.h item_uniq.h \ + item_create.h item_subselect.h item_row.h \ diff --git a/mysql.monitrc b/mysql.monitrc new file mode 100644 index 0000000..87c89ba --- /dev/null +++ b/mysql.monitrc @@ -0,0 +1,23 @@ +check process mysql with pidfile /var/lib/mysql/mysqldb/mysql.pid + group database + start program = "/etc/rc.d/init.d/mysql restart" + stop program = "/etc/rc.d/init.d/mysql stop" + if failed unix /var/lib/mysql/mysql.sock then restart + if 5 restarts within 5 cycles then timeout + depends on mysql_bin + depends on mysql_rc + +check file mysql_bin with path /usr/sbin/mysqld + group database + if failed checksum then unmonitor + if failed permission 755 then unmonitor + if failed uid root then unmonitor + if failed gid root then unmonitor + +check file mysql_rc with path /etc/rc.d/init.d/mysql + group database + if failed checksum then unmonitor + if failed permission 754 then unmonitor + if failed uid root then unmonitor + if failed gid root then unmonitor + diff --git a/mysql.sysconfig b/mysql.sysconfig new file mode 100644 index 0000000..82056ac --- /dev/null +++ b/mysql.sysconfig @@ -0,0 +1,21 @@ +# Customized settings for mysql + +# Define nice level for mysql +SERVICE_RUN_NICE_LEVEL="+0" + +# Be compatible with RA layout (not supported) +MYSQL_RA_COMPAT="no" + +# For clusters configuration look into /etc/mysql/clusters.conf +# Don't use **obsolete** MYSQL_DB_CLUSTERS option + +# Seconds to wait for fully initialized mysqld to start. mysqld takes longer to +# start when it has to replay innodb logs, or create innodb pools at startup +#MYSQL_START_WAIT_TIME=15 + +# Seconds to wait for mysqld to terminate on shutdown. If timeout is exceeded +# shutdown is considered failed +#MYSQL_STOP_WAIT_TIME=900 + +# Skip automatic mysqld restarts invoked from rpm installs. +#RPM_SKIP_AUTO_RESTART=yes -- 2.44.0