rebase

Author: James Cor

sql/expression/convert.go

@@ -19,7 +19,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/dolthub/vitess/go/mysql"
 	"github.com/dolthub/vitess/go/sqltypes"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/src-d/go-errors.v1"

sql/types/decimal.go

@@ -20,9 +20,6 @@ import (
 	"math/big"
 	"reflect"
 
-	"github.com/dolthub/vitess/go/sqltypes"
-	"github.com/dolthub/vitess/go/vt/proto/query"
-	"github.com/shopspring/decimal"
 	"github.com/shopspring/decimal"
 	"gopkg.in/src-d/go-errors.v1"