[WWcvs] webwork2: work around for mysqldump bug (or bad documentation) new version will work fine as long as only one defaults file is

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
work around for mysqldump bug (or bad documentation)

new version will work fine as long as only one defaults file is to be read.

Modified Files:
--------------
    webwork2/lib/WeBWorK/DB/Schema/NewSQL:
        Std.pm

Revision Data
-------------
Index: Std.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/DB/Schema/NewSQL/Std.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -Llib/WeBWorK/DB/Schema/NewSQL/Std.pm -Llib/WeBWorK/DB/Schema/NewSQL/Std.pm -u -r1.22 -r1.23
--- lib/WeBWorK/DB/Schema/NewSQL/Std.pm
+++ lib/WeBWorK/DB/Schema/NewSQL/Std.pm
@@ -219,7 +219,8 @@
 	# 2>&1 is specified first, which apparently makes stderr go to stdout
 	# and stdout (not including stderr) go to the dumpfile. see bash(1).
 	my $dump_cmd = "2>&1 " . shell_quote($mysqldump)
-		. " --defaults-extra-file=" . shell_quote($my_cnf->filename)
+# 		. " --defaults-extra-file=" . shell_quote($my_cnf->filename)
+		. " --defaults-file=" . shell_quote($my_cnf->filename) # work around for mysqldump bug
 		. " " . shell_quote($database)
 		. " " . shell_quote($self->sql_table_name)
 		. " > " . shell_quote($dumpfile_path);
@@ -242,7 +243,8 @@
 	my $mysql = $self->{params}{mysql_path};
 	
 	my $restore_cmd = "2>&1 " . shell_quote($mysql)
-		. " --defaults-extra-file=" . shell_quote($my_cnf->filename)
+# 		. " --defaults-extra-file=" . shell_quote($my_cnf->filename)
+		. " --defaults-file=" . shell_quote($my_cnf->filename) # work around for mysqldump bug
 		. " " . shell_quote($database)
 		. " < " . shell_quote($dumpfile_path);
 	my $restore_out = readpipe $restore_cmd;