Merge branch 'james/truncation' of github.com:dolthub/go-mysql-server into james/truncation

Author: James Cor

sql/types/decimal.go

@@ -20,12 +20,12 @@ import (
 	"math/big"
 	"reflect"
 
+	"github.com/dolthub/vitess/go/sqltypes"
+	"github.com/dolthub/vitess/go/vt/proto/query"
 	"github.com/shopspring/decimal"
 	"gopkg.in/src-d/go-errors.v1"
 
 	"github.com/dolthub/go-mysql-server/sql"
-	"github.com/dolthub/vitess/go/sqltypes"
-	"github.com/dolthub/vitess/go/vt/proto/query"
 )
 
 const (