Bug fix for --os-shell on MySQL (it was not working for a long time because of this)

stamparm · stamparm · commit 1d07b9373048 · 2012-10-29T15:45:30.000+01:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1529,7 +1529,7 @@ def getSQLSnippet(dbms, sfile, **variables):
 
     retVal = readCachedFileContent(filename)
     retVal = re.sub(r"#.+", "", retVal)
-    retVal = re.sub(r"(?s);\s+", "; ", retVal).strip()
+    retVal = re.sub(r"(?s);\s+", "; ", retVal).strip("\r\n")
 
     for _ in variables.keys():
         retVal = re.sub(r"%%%s%%" % _, variables[_], retVal)
diff --git a/procs/mysql/write_file_limit.sql b/procs/mysql/write_file_limit.sql
@@ -1 +1 @@
-LIMIT 1 INTO OUTFILE '%OUTFILE%' LINES TERMINATED BY 0x%HEXSTRING% --
+LIMIT 1 INTO OUTFILE '%OUTFILE%' LINES TERMINATED BY 0x%HEXSTRING%-- 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-LIMIT 1 INTO OUTFILE '%OUTFILE%' LINES TERMINATED BY 0x%HEXSTRING% --`
	`1`	`+LIMIT 1 INTO OUTFILE '%OUTFILE%' LINES TERMINATED BY 0x%HEXSTRING%--`