executor, types: format output

executor/show.go

@@ -32,6 +32,7 @@ import (
 	"github.com/pingcap/tidb/terror"
 	"github.com/pingcap/tidb/util/auth"
 	"github.com/pingcap/tidb/util/charset"
+	"github.com/pingcap/tidb/util/format"
 	"github.com/pingcap/tidb/util/types"
 )
 
@@ -530,7 +531,7 @@ func (e *ShowExec) fetchShowCreateTable() error {
 	}
 
 	if len(tb.Meta().Comment) > 0 {
-		buf.WriteString(fmt.Sprintf(" COMMENT='%s'", tb.Meta().Comment))
+		buf.WriteString(fmt.Sprintf(" COMMENT='%s'", format.OutputFormat(tb.Meta().Comment)))
 	}
 
 	data := types.MakeDatums(tb.Meta().Name.O, buf.String())

util/format/format.go

@@ -20,6 +20,7 @@ package format
 import (
 	"fmt"
 	"io"
+	"strings"
 )
 
 const (
@@ -171,3 +172,23 @@ func FlatFormatter(w io.Writer) Formatter {
 func (f *flatFormatter) Format(format string, args ...interface{}) (n int, errno error) {
 	return (*indentFormatter)(f).format(true, format, args...)
 }
+
+// OutputFormat output escape character with backslash
+func OutputFormat(s string) string {
+	replace := map[string]string{
+		"'":  "''",
+		"\a": "\\a",
+		"\b": "\\b",
+		"\f": "\\f",
+		"\n": "\\n",
+		"\r": "\\r",
+		"\t": "\\t",
+		"\v": "\\v",
+	}
+
+	for old, new := range replace {
+		s = strings.Replace(s, old, new, -1)
+	}
+
+	return s
+}

util/types/field_type.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/charset"
+	"github.com/pingcap/tidb/util/format"
 	"github.com/pingcap/tidb/util/types/json"
 )
 
@@ -206,7 +207,7 @@ func (ft *FieldType) CompactStr() string {
 		// Format is ENUM ('e1', 'e2') or SET ('e1', 'e2')
 		es := make([]string, 0, len(ft.Elems))
 		for _, e := range ft.Elems {
-			e = strings.Replace(e, "'", "''", -1)
+			e = format.OutputFormat(e)
 			es = append(es, e)
 		}
 		suffix = fmt.Sprintf("('%s')", strings.Join(es, "','"))

util/types/field_type_test.go

@@ -97,6 +97,14 @@ func (s *testFieldTypeSuite) TestFieldType(c *C) {
 	ft.Elems = []string{"'a'", "'b'"}
 	c.Assert(ft.String(), Equals, "enum('''a''','''b''')")
 
+	ft = NewFieldType(mysql.TypeEnum)
+	ft.Elems = []string{"a\nb", "a\tb", "a\rb"}
+	c.Assert(ft.String(), Equals, "enum('a\\nb','a\\tb','a\\rb')")
+
+	ft = NewFieldType(mysql.TypeEnum)
+	ft.Elems = []string{"a'\nb", "a'b\tc"}
+	c.Assert(ft.String(), Equals, "enum('a''\\nb','a''b\\tc')")
+
 	ft = NewFieldType(mysql.TypeSet)
 	ft.Elems = []string{"a", "b"}
 	c.Assert(ft.String(), Equals, "set('a','b')")
@@ -105,6 +113,14 @@ func (s *testFieldTypeSuite) TestFieldType(c *C) {
 	ft.Elems = []string{"'a'", "'b'"}
 	c.Assert(ft.String(), Equals, "set('''a''','''b''')")
 
+	ft = NewFieldType(mysql.TypeSet)
+	ft.Elems = []string{"a\nb", "a\tb", "a\rb"}
+	c.Assert(ft.String(), Equals, "set('a\\nb','a\\tb','a\\rb')")
+
+	ft = NewFieldType(mysql.TypeSet)
+	ft.Elems = []string{"a'\nb", "a'b\tc"}
+	c.Assert(ft.String(), Equals, "set('a''\\nb','a''b\\tc')")
+
 	ft = NewFieldType(mysql.TypeTimestamp)
 	ft.Flen = 8
 	ft.Decimal = 2