expression: fix unexpected constant fold when year compare string (pi…

…ngcap#23281)
miking38 · Mar 16, 2021 · 7a9b07e · 7a9b07e
1 parent 23227ea
commit 7a9b07e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/expression/builtin_compare.go b/expression/builtin_compare.go
@@ -1314,10 +1314,7 @@ func RefineComparedConstant(ctx sessionctx.Context, targetFieldType types.FieldT
 			if err != nil {
 				return con, false
 			}
-			if c, err = doubleDatum.CompareDatum(sc, &intDatum); err != nil {
-				return con, false
-			}
-			if c != 0 {
+			if doubleDatum.GetFloat64() > math.Trunc(doubleDatum.GetFloat64()) {
 				return con, true
 			}
 			return &Constant{

diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -8879,6 +8879,16 @@ func (s *testIntegrationSuite) Test22717(c *C) {
 	tk.MustQuery("select d from t where d").Check(testkit.Rows("0", "1", "0,1"))
 }
 
+func (s *testIntegrationSuite) Test23262(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t")
+	tk.MustExec("create table t(a year)")
+	tk.MustExec("insert into t values(2002)")
+	tk.MustQuery("select * from t where a=2").Check(testkit.Rows("2002"))
+	tk.MustQuery("select * from t where a='2'").Check(testkit.Rows("2002"))
+}
+
 func (s *testIntegrationSerialSuite) TestPartitionPruningRelaxOP(c *C) {
 	// Discovered while looking at issue 19941 (not completely related)
 	// relaxOP relax the op > to >= and < to <=