expression: fix shadow warning (pingcap#2354)

edric-shen · Dec 30, 2016 · 42dd3c8 · 42dd3c8
1 parent b180334
commit 42dd3c8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/expression/constant_propagation.go b/expression/constant_propagation.go
@@ -171,8 +171,9 @@ func (s *propagateConstantSolver) pickNewEQConds(visited []bool) (retMapper map[
 		}
 		col, con := s.validPropagateCond(cond, eqFuncNameMap)
 		// Then we check if this CNF item is a false constant. If so, we will set the whole condition to false.
+		ok := false
 		if col == nil {
-			if con, ok := cond.(*Constant); ok {
+			if con, ok = cond.(*Constant); ok {
 				value, _ := EvalBool(con, nil, s.ctx)
 				if !value {
 					s.setConds2ConstFalse()