From db0ecf2662c54b1382305908413b45c75f2dfd19 Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@askmonty.org>
Date: Sat, 6 Jun 2015 19:12:44 +0500
Subject: [PATCH] MDEV-8032 [PATCH] audit plugin - csv output broken.   
 Symbols like TAB or NEWLINE should be escaped, which was         forgotten in
 one place.

---
 mysql-test/suite/plugins/r/server_audit.result | 6 ++++++
 mysql-test/suite/plugins/t/server_audit.test   | 3 +++
 plugin/server_audit/server_audit.c             | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/mysql-test/suite/plugins/r/server_audit.result b/mysql-test/suite/plugins/r/server_audit.result
index c9ec79dbafe..d0649a1fc1f 100644
--- a/mysql-test/suite/plugins/r/server_audit.result
+++ b/mysql-test/suite/plugins/r/server_audit.result
@@ -45,6 +45,11 @@ id
 2
 alter table t1 rename renamed_t1;
 set global server_audit_events='connect,query';
+select 1,
+2,
+3;
+1	2	3
+1	2	3
 insert into t2 values (1), (2);
 select * from t2;
 id
@@ -244,6 +249,7 @@ TIME,HOSTNAME,root,localhost,ID,ID,ALTER,test,t1,
 TIME,HOSTNAME,root,localhost,ID,ID,RENAME,test,t1|test.renamed_t1,
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'alter table t1 rename renamed_t1',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_events=\'connect,query\'',0
+TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1, 2, 3',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t2',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t_doesnt_exist',ID
diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test
index 3c9544d61f4..c126b845def 100644
--- a/mysql-test/suite/plugins/t/server_audit.test
+++ b/mysql-test/suite/plugins/t/server_audit.test
@@ -35,6 +35,9 @@ insert into t2 values (1), (2);
 select * from t2;
 alter table t1 rename renamed_t1;
 set global server_audit_events='connect,query';
+select 1,
+        2,
+        3;
 insert into t2 values (1), (2);
 select * from t2;
 --error ER_NO_SUCH_TABLE
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index a4d726b0c7d..4aa8652de52 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -1118,6 +1118,8 @@ static size_t escape_string(const char *str, unsigned int len,
       *(result++)= '\\';
       *(result++)= '\\';
     }
+    else if (is_space(*str))
+      *(result++)= ' ';
     else
       *(result++)= *str;
     str++;