Merge lp:~ourdelta-core/ourdelta/ourdelta-mysql-5.0.77-configtest into lp:~ourdelta-core/ourdelta/ourdelta-mysql-5.0.77

[Cafuego]

[Cafuego (cafuego)]

Configtest stuff

[lp:~ourdelta-core/ourdelta/ourdelta-mysql-5.0.77-configtest]

49. By Arjen Lentz on 2009-03-19

Merge from cafuego's configtest branch
(includes fixes for both general and debian)

[Arjen Lentz (arjen-lentz)]

review: Approve

=== added file '.bzrignore'
=== modified file 'bakery/debian-5.0/patches/00list'
--- bakery/debian-5.0/patches/00list	2008-10-21 00:58:43 +0000
+++ bakery/debian-5.0/patches/00list	2009-03-19 05:58:44 +0000
@@ -1,6 +1,7 @@
 01_MAKEFILES__Docs_Images_Makefile.in.dpatch
 01_MAKEFILES__Docs_Makefile.in.dpatch
 25_mysys__default.c.dpatch
+35_init__openquery_configtest.dpatch
 36_scripts__mysqld_safe.sh__percona_syslog_undo.dpatch
 37_scripts__mysqld_safe.sh__syslog.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch

=== added file 'bakery/debian-5.0/patches/35_init__openquery_configtest.dpatch'
--- bakery/debian-5.0/patches/35_init__openquery_configtest.dpatch	1970-01-01 00:00:00 +0000
+++ bakery/debian-5.0/patches/35_init__openquery_configtest.dpatch	2009-03-19 05:58:44 +0000
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 35_init__openquery_configtest.dpatch by  <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: init__openquery_configtest.dpatch
+
+@DPATCH@
+
+--- old/debian/mysql-server-5.0.mysql.init.orig	2008-12-19 12:03:30.379898336 +1100
++++ new/debian/mysql-server-5.0.mysql.init	2008-12-19 12:04:46.660451093 +1100
+@@ -182,8 +182,21 @@
+ 	fi
+   	;;
+ 
++  'configtest')
++	log_daemon_msg "Testing MySQL configuration" "syntax"
++	set +e
++	help_out=`/usr/sbin/mysqld --help 2>&1`; r=$?
++	set -e
++	if [ "$r" -ne 0 ]; then
++	  log_failure_msg "$help_out"
++	  log_failure_msg "There are syntax errors in the server configuration. Please fix them!"
++	fi
++	log_end_msg $r
++	exit $r
++    ;;
++
+   *)
+-	echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
++	echo "Usage: $SELF start|stop|restart|reload|force-reload|status|configtest"
+ 	exit 1
+ 	;;
+ esac

=== added directory 'mysql/5.0/ourdelta/configtest'
=== added file 'mysql/5.0/ourdelta/configtest/configtest.patch'
--- mysql/5.0/ourdelta/configtest/configtest.patch	1970-01-01 00:00:00 +0000
+++ mysql/5.0/ourdelta/configtest/configtest.patch	2009-03-19 05:58:44 +0000
@@ -0,0 +1,38 @@
+Index: mysql-5.0.77/support-files/mysql.server.sh
+===================================================================
+--- mysql-5.0.77.orig/support-files/mysql.server.sh
++++ mysql-5.0.77/support-files/mysql.server.sh
+@@ -424,7 +424,32 @@ case "$mode" in
+       fi
+     fi
+     ;;
+-    *)
++  'configtest')
++    # Try to find the mysqld binary.
++    echo $echo_n "Testing MySQL configuration syntax"
++    if test -x $sbindir/mysqld
++    then
++      mysql_daemon=$sbindir/mysqld
++    elif test -x $libexecdir/mysqld
++    then
++      mysql_daemon=$libexecdir/mysqld
++    elif test -x `which mysqld`
++    then
++      mysql_daemon=`which mysqld`
++    else
++      log_failure_msg "Unable to locate the mysqld binary!"
++      exit 1
++    fi
++    help_out=`$mysql_daemon --help 2>&1`; r=$?
++    if test "$r" != 0 ; then
++      log_failure_msg "$help_out"
++      log_failure_msg "There are syntax errors in the server configuration. Please fix them!"
++    else
++      log_success_msg "Syntax OK"
++    fi
++    exit $r
++    ;;
++  *)
+       # usage
+       echo "Usage: $0  {start|stop|restart|reload|force-reload|status}  [ MySQL server options ]"
+       exit 1

=== modified file 'mysql/5.0/patches-build-ourdelta'
--- mysql/5.0/patches-build-ourdelta	2009-03-18 06:35:34 +0000
+++ mysql/5.0/patches-build-ourdelta	2009-03-19 05:58:44 +0000
@@ -3,6 +3,7 @@
 #
 ourdelta/version/version.patch
 ourdelta/mysql_install_db/mysql_install_db.patch
+ourdelta/configtest/configtest.patch
 #
 percona_maintained/show_patches.patch
 #