Merge branch 'master' into puppet3

mysql/templates/mysql-backup.cron.erb

@@ -5,6 +5,7 @@ MAXAGE="<%= @mysql_backup_maxage %>"
 
 DATE=`date "+%Y-%m-%d"`
 HOME="`getent passwd ${USER} | cut -d : -f 6`"
+OPTS=""
 
 if [ ! -d ${DESTDIR} ]; then
     echo "ERR: MySQL backup directory [${DESTDIR}] does not exist" 1>&2
@@ -15,6 +16,11 @@ umask 077
 
 tmpwatch -m -f ${MAXAGE} ${DESTDIR}
 
+mysqldump -E > /dev/null 2>&1
+if [ $? -ne 2 ]; then
+    OPTS="${OPTS} -E"
+fi
+
 DESTDIR=${DESTDIR}/${DATE}
 mkdir -p ${DESTDIR}
 
@@ -24,5 +30,5 @@ for db in `mysql -e 'show databases' -s` ; do
             continue
             ;;
     esac
-    mysqldump --add-drop-table ${db} | gzip > ${DESTDIR}/${db}.${DATE}.gz
+    mysqldump --add-drop-table ${OPTS} ${db} | gzip > ${DESTDIR}/${db}.${DATE}.gz
 done