From: intrigeri <intrigeri@boum.org>
Date: Tue, 9 Dec 2008 11:40:03 +0000 (+0000)
Subject: mysql: new sqldumpoptions config variable (Closes: #502966)
X-Git-Tag: backupninja-0.9.7~44
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=2cfcdd636d21e353f061fdc563c4b6dee3a4d979;p=matthijs%2Fupstream%2Fbackupninja.git

mysql: new sqldumpoptions config variable (Closes: #502966)
---

diff --git a/ChangeLog b/ChangeLog
index d6292ec..87d3284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ version 0.9.7 -- UNRELEASED
 	maildir:
 	 . fix location of deleted_on file
 	 . add missing destid_file options to ssh connections
+	mysql:
+	 . Options passed to mysqldump are now customizable with the new
+	   sqldumpoptions configuration variable. Thanks to Chris Lamb for his
+	   preliminary patch (Closes: #502966)
 
 version 0.9.6 -- July 21, 2008
     backupninja changes
diff --git a/examples/example.mysql b/examples/example.mysql
index bd996e7..de9651f 100644
--- a/examples/example.mysql
+++ b/examples/example.mysql
@@ -73,6 +73,10 @@ compress    = yes
 # make a backup using mysqldump. this creates text files with sql commands
 # sufficient to recontruct the database.
 #
+# sqldumpoptions = <options>
+# (default = --lock-tables --complete-insert --add-drop-table --quick --quote-names)
+# arguments to pass to mysqldump
+#
 # compress = < yes | no > (default = yes)
 # if yes, compress the sqldump output. 
 #
diff --git a/handlers/mysql.helper.in b/handlers/mysql.helper.in
index 9622d41..00eeca0 100644
--- a/handlers/mysql.helper.in
+++ b/handlers/mysql.helper.in
@@ -94,6 +94,11 @@ $hotcopy
 #
 $sqldump
 
+# sqldumpoptions = <options>
+# (default = --lock-tables --complete-insert --add-drop-table --quick --quote-names)
+# arguments to pass to mysqldump
+# sqldumpoptions = --add-drop-table --quick --quote-names
+
 # compress = < yes | no > (default = yes)
 # if yes, compress the sqldump output.
 $compress
diff --git a/handlers/mysql.in b/handlers/mysql.in
index fe1e783..c80a36a 100644
--- a/handlers/mysql.in
+++ b/handlers/mysql.in
@@ -10,6 +10,7 @@ getconf nodata
 getconf dbhost localhost
 getconf hotcopy no
 getconf sqldump no
+getconf sqldumpoptions "--lock-tables --complete-insert --add-drop-table --quick --quote-names"
 getconf compress yes
 getconf vsname
 
@@ -245,7 +246,7 @@ then
 
 	for db in $databases
 	do
-           DUMP_BASE="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names"
+           DUMP_BASE="$MYSQLDUMP $defaultsfile $sqldumpoptions"
 
            # Dumping structure and data
            DUMP="$DUMP_BASE $ignore $db"