fix

pingcap · May 13, 2021 · c515328 · c515328
1 parent 68d0a25
commit c515328
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -9344,4 +9344,14 @@ func (s *testIntegrationSuite) TestEnumIndex(c *C) {
 		testkit.Rows(
 			"OFJHCEKCQGT:MXI7P3[YO4N0DF=2XJWJ4Z9Z;HQ8TMUTZV8YLQAHWJ4BDZHR3A -30 <nil>",
 			"ZOHBSCRMZPOI`IVTSEZAIDAF7DS@1TT20AP9 -30 <nil>"))
+
+	// issue 24576
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t;")
+	tk.MustExec("create table t(col1 enum('a','b','c'), col2 enum('a','b','c'), col3 int, index idx(col1,col2));")
+	tk.MustExec("insert into t values(1,1,1),(2,2,2),(3,3,3);")
+	tk.MustQuery("select /*+ use_index(t,idx) */ col3 from t where col2 between 'b' and 'b' and col1 is not null;").Check(
+		testkit.Rows("2"))
+	tk.MustQuery("select /*+ use_index(t,idx) */ col3 from t where col2 = 'b' and col1 is not null;").Check(
+		testkit.Rows("2"))
 }
diff --git a/util/ranger/points.go b/util/ranger/points.go
@@ -458,7 +458,7 @@ func handleEnumFromBinOp(sc *stmtctx.StatementContext, ft *types.FieldType, val
 	tmpEnum := types.Enum{}
 	for i := range ft.Elems {
 		tmpEnum.Name = ft.Elems[i]
-		tmpEnum.Value = uint64(i)
+		tmpEnum.Value = uint64(i) + 1
 		d := types.NewMysqlEnumDatum(tmpEnum)
 		if v, err := d.CompareDatum(sc, &val); err == nil {
 			switch op {