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

Author: James Cor

sql/expression/convert.go

@@ -17,11 +17,11 @@ package expression
 import (
 	"encoding/hex"
 	"fmt"
-	"github.com/dolthub/vitess/go/sqltypes"
-"strconv"
+	"strconv"
 	"strings"
 	"time"
 
+	"github.com/dolthub/vitess/go/sqltypes"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/src-d/go-errors.v1"