Merge pull request pingcap#156 from pingcap/shenli/fix-master

plans: Fix build error
WangCrystal · Sep 15, 2015 · 3be1f44 · 3be1f44
2 parents 6adf665 + f6577d4
commit 3be1f44
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/plan/plans/orderby.go b/plan/plans/orderby.go
@@ -234,13 +234,7 @@ func (r *OrderByDefaultPlan) fetchAll(ctx context.Context) error {
 			}
 
 			if val != nil {
-				var ordered bool
-				val, ordered, err1 = types.IsOrderedType(val)
-				if err1 != nil {
-					return err1
-				}
-
-				if !ordered {
+				if !types.IsOrderedType(val) {
 					return errors.Errorf("cannot order by %v (type %T)", val, val)
 				}
 			}