*: fix union scan's bug. (pingcap#4000)

Torrence · Aug 3, 2017 · 5231794 · 5231794
1 parent 0e8bffa
commit 5231794
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/executor/union_scan_test.go b/executor/union_scan_test.go
@@ -59,5 +59,13 @@ func (s *testSuite) TestDirtyTransaction(c *C) {
 	tk.MustExec("truncate table t")
 	tk.MustExec("insert t values (3, 4)")
 	tk.MustQuery("select * from t").Check(testkit.Rows("3 4"))
-	tk.Exec("abort")
+	tk.MustExec("commit")
+
+	tk.MustExec("drop table if exists t")
+	tk.MustExec("create table t (a int, b int)")
+	tk.MustExec("insert t values (2, 3), (4, 5), (6, 7)")
+	tk.MustExec("begin")
+	tk.MustExec("insert t values (0, 1)")
+	tk.MustQuery("select * from t where b = 3").Check(testkit.Rows("2 3"))
+	tk.MustExec("commit")
 }
diff --git a/plan/resolve_indices.go b/plan/resolve_indices.go
@@ -127,6 +127,7 @@ func (p *PhysicalIndexJoin) ResolveIndices() {
 
 // ResolveIndices implements Plan interface.
 func (p *PhysicalUnionScan) ResolveIndices() {
+	p.basePlan.ResolveIndices()
 	for _, expr := range p.Conditions {
 		expr.ResolveIndices(p.children[0].Schema())
 	}