git push

Author: James Cor

server/handler.go

@@ -949,12 +949,12 @@ func RowToSQL(ctx *sql.Context, sch sql.Schema, row sql.Row, projs []sql.Express
 
 	outVals := make([]sqltypes.Value, len(sch))
 	var err error
-	var buf []byte = make([]byte, 256)
+	var newBuf = make([]byte, 256)
 	if br, ok := row.(sql.BytesRow); ok {
 		if len(projs) == 0 {
 			for i, col := range sch {
-				val, err := br.GetBytes(i, col.Type, buf[:0])
-				buf = buf[len(val):]
+				val, err := br.GetBytes(i, col.Type, newBuf[:0])
+				newBuf = newBuf[len(val):]
 				if err != nil {
 					return nil, err
 				}
@@ -971,8 +971,8 @@ func RowToSQL(ctx *sql.Context, sch sql.Schema, row sql.Row, projs []sql.Express
 			e := projs[i]
 			switch e := e.(type) {
 			case *expression.GetField:
-				val, err := br.GetBytes(e.Index(), col.Type, buf[:0])
-				buf = buf[len(val):]
+				val, err := br.GetBytes(e.Index(), col.Type, newBuf[:0])
+				newBuf = newBuf[len(val):]
 				if err != nil {
 					return nil, err
 				}

sql/planbuilder/priv.go

@@ -163,7 +163,7 @@ func (b *Builder) buildAuthenticatedUser(user ast.AccountWithAuth) plan.Authenti
 		} else if user.Auth1.Plugin == string(mysql.CachingSha2Password) {
 			authUser.Auth1 = plan.NewCachingSha2PasswordAuthentication(user.Auth1.Password)
 		} else if len(user.Auth1.Plugin) > 0 {
-			authUser.Auth1 = plan.NewOtherAuthentication(user.Auth1.Password, user.Auth1.Plugin)
+			authUser.Auth1 = plan.NewOtherAuthentication(user.Auth1.Password, user.Auth1.Plugin, user.Auth1.Identity)
 		} else {
 			// We default to using the password, even if it's empty
 			authUser.Auth1 = plan.NewDefaultAuthentication(user.Auth1.Password)

sql/rowexec/show.go

@@ -78,14 +78,14 @@ func (b *BaseBuilder) buildDescribeQuery(ctx *sql.Context, n *plan.DescribeQuery
 		formatString := sql.Describe(n.Child, n.Format)
 		for _, l := range strings.Split(formatString, "\n") {
 			if strings.TrimSpace(l) != "" {
-				rows = append(rows, sql.NewRow(l))
+				rows = append(rows, sql.NewUntypedRow(l))
 			}
 		}
 		return sql.RowsToRowIter(rows...), nil
 	}
 
 	ctx.Warn(0, "EXPLAIN Output is currently a placeholder; use EXPLAIN PLAN for old behavior")
-	dummyRow := sql.Row{
+	dummyRow := sql.UntypedSqlRow{
 		1,        // id
 		"SELECT", // select_type
 		"NULL",   // table