From 1d07b93730488c06bd8506de0cb3924d4ec967ba Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 29 Oct 2012 15:45:30 +0100 Subject: [PATCH] Bug fix for --os-shell on MySQL (it was not working for a long time because of this) --- lib/core/common.py | 2 +- procs/mysql/write_file_limit.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index d97dc069c..893715c8e 100644 --- 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 index aea1a8940..47f6caaa1 100644 --- 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%--