resolve conflicts

Signed-off-by: zyguan <zhongyangguan@gmail.com>
pingcap · Aug 9, 2022 · 1cb0d33 · 1cb0d33
1 parent a02473c
commit 1cb0d33
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/executor/insert_test.go b/executor/insert_test.go
@@ -1589,16 +1589,9 @@ func (s *testSuite9) TestIssue10402(c *C) {
 	tk.MustExec("delete from vctt")
 	tk.Se.GetSessionVars().StmtCtx.SetWarnings(nil)
 	tk.MustExec("insert into vctt values ('ab\\n\\n\\n', 'ab\\n\\n\\n'), ('ab\\t\\t\\t', 'ab\\t\\t\\t'), ('ab    ', 'ab    '), ('ab\\r\\r\\r', 'ab\\r\\r\\r')")
-<<<<<<< HEAD
 	c.Check(tk.Se.GetSessionVars().StmtCtx.WarningCount(), Equals, uint16(4))
 	warns := tk.Se.GetSessionVars().StmtCtx.GetWarnings()
-	c.Check(fmt.Sprintf("%v", warns), Equals, "[{Warning [types:1265]Data truncated, field len 4, data len 5} {Warning [types:1265]Data truncated, field len 4, data len 5} {Warning [types:1265]Data truncated, field len 4, data len 6} {Warning [types:1265]Data truncated, field len 4, data len 5}]")
-=======
-	require.Equal(t, uint16(4), tk.Session().GetSessionVars().StmtCtx.WarningCount())
-	warns := tk.Session().GetSessionVars().StmtCtx.GetWarnings()
-	require.Equal(t, "[{Warning [types:1265]Data truncated for column 'v' at row 1} {Warning [types:1265]Data truncated for column 'v' at row 2} {Warning [types:1265]Data truncated for column 'v' at row 3} {Warning [types:1265]Data truncated for column 'v' at row 4}]",
-		fmt.Sprintf("%v", warns))
->>>>>>> 6418350e9... executor,expression: avoid to append nil to warnings (#36304)
+	c.Check(fmt.Sprintf("%v", warns), Equals, "[{Warning [types:1265]Data truncated for column 'v' at row 1} {Warning [types:1265]Data truncated for column 'v' at row 2} {Warning [types:1265]Data truncated for column 'v' at row 3} {Warning [types:1265]Data truncated for column 'v' at row 4}]")
 	tk.MustQuery("select * from vctt").Check(testkit.Rows("ab\n\n ab\n\n", "ab\t\t ab\t\t", "ab   ab", "ab\r\r ab\r\r"))
 	tk.MustQuery("select length(v), length(c) from vctt").Check(testkit.Rows("4 4", "4 4", "4 2", "4 4"))
 }
@@ -1806,12 +1799,7 @@ func (s *testSuite10) TestStringtoDecimal(c *C) {
 	tk.MustGetErrCode("insert into t values('1.2.')", errno.ErrTruncatedWrongValueForField)
 	tk.MustGetErrCode("insert into t values('1,999.00')", errno.ErrTruncatedWrongValueForField)
 	tk.MustExec("insert into t values('12e-3')")
-<<<<<<< HEAD
-	tk.MustQuery("show warnings;").Check(testutil.RowsWithSep("|", "Warning|1292|Truncated incorrect DECIMAL value: '0.012'"))
-=======
-	// TODO: MySQL8.0 reports Note 1265 Data truncated for column 'id' at row 1
-	tk.MustQuery("show warnings;").Check(testkit.RowsWithSep("|", "Warning|1366|Incorrect decimal value: '12e-3' for column 'id' at row 1"))
->>>>>>> 6418350e9... executor,expression: avoid to append nil to warnings (#36304)
+	tk.MustQuery("show warnings;").Check(testutil.RowsWithSep("|", "Warning|1366|Incorrect decimal value: '12e-3' for column 'id' at row 1"))
 	tk.MustQuery("select id from t").Check(testkit.Rows("0"))
 	tk.MustExec("drop table if exists t")
 }