cherry pick #22100 to release-4.0 (#22103)

executor/select_into.go

@@ -193,7 +193,13 @@ func (s *SelectIntoExec) dumpToOutfile() error {
 			case mysql.TypeJSON:
 				s.fieldBuf = append(s.fieldBuf, row.GetJSON(j).String()...)
 			}
-			s.lineBuf = append(s.lineBuf, s.escapeField(s.fieldBuf)...)
+
+			switch col.GetType().EvalType() {
+			case types.ETString, types.ETJson:
+				s.lineBuf = append(s.lineBuf, s.escapeField(s.fieldBuf)...)
+			default:
+				s.lineBuf = append(s.lineBuf, s.fieldBuf...)
+			}
 			if (encloseFlag && !encloseOpt) ||
 				(encloseFlag && encloseOpt && s.considerEncloseOpt(et)) {
 				s.lineBuf = append(s.lineBuf, encloseByte)

executor/select_into_test.go

@@ -246,3 +246,23 @@ func (s *testSuite1) TestDumpReal(c *C) {
 		c.Assert(string(buf), Equals, testCase.result)
 	}
 }
+
+func (s *testSuite1) TestEscapeType(c *C) {
+	outfile := randomSelectFilePath("TestEscapeType")
+	tk := testkit.NewTestKit(c, s.store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t")
+	tk.MustExec(`create table t (
+	a int,
+	b double,
+	c varchar(10),
+	d blob,
+	e json,
+	f set('1', '2', '3'),
+	g enum('1', '2', '3'))`)
+	tk.MustExec(`insert into t values (1, 1, "1", "1", '{"key": 1}', "1", "1")`)
+
+	tk.MustExec(fmt.Sprintf("select * from t into outfile '%v' fields terminated by ',' escaped by '1'", outfile))
+	cmpAndRm(`1,1,11,11,{"key": 11},11,11
+`, outfile, c)
+}