Merge branch 'master' into br-remove-cdclog

pingcap · Dec 9, 2021 · 80ae4a2 · 80ae4a2
2 parents 1244eb6 + 05f7c6d
commit 80ae4a2
Show file tree

Hide file tree

Showing 4 changed files with 645 additions and 645 deletions.
diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -3978,6 +3978,8 @@ func (s *testIntegrationSuite) TestCompareBuiltin(c *C) {
 	result.Check(testkit.Rows("1 1 1"))
 	result = tk.MustQuery(`select INTERVAL(100, NULL, NULL, NULL, NULL, NULL, 100);`)
 	result.Check(testkit.Rows("6"))
+	result = tk.MustQuery(`SELECT INTERVAL(0,(1*5)/2) + INTERVAL(5,4,3);`)
+	result.Check(testkit.Rows("2"))
 
 	// for greatest
 	result = tk.MustQuery(`select greatest(1, 2, 3), greatest("a", "b", "c"), greatest(1.1, 1.2, 1.3), greatest("123a", 1, 2)`)