include Wrapper values for out of band values

Author: James Cor

server/handler.go

@@ -870,7 +870,22 @@ func (h *Handler) resultForDefaultIter2(ctx *sql.Context, c *mysql.Conn, iter sq
 				}
 				resRow := make([]sqltypes.Value, len(row))
 				for i, v := range row {
-					resRow[i] = sqltypes.MakeTrusted(v.Typ, v.Val)
+					if v.Val != nil || v.Val2 == nil {
+						resRow[i] = sqltypes.MakeTrusted(v.Typ, v.Val)
+						continue
+					}
+					dVal, err := v.Val2.UnwrapAny(ctx)
+					if err != nil {
+						return err
+					}
+					switch dVal := dVal.(type) {
+					case []byte:
+						resRow[i] = sqltypes.MakeTrusted(v.Typ, dVal)
+					case string:
+						resRow[i] = sqltypes.MakeTrusted(v.Typ, []byte(dVal))
+					default:
+						panic(fmt.Sprintf("unexpected type %T", dVal))
+					}
 				}
 				ctx.GetLogger().Tracef("spooling result row %s", resRow)
 				res.Rows = append(res.Rows, resRow)

sql/row_frame.go

@@ -38,19 +38,20 @@ func (r Row2) Len() int {
 	return len(r)
 }
 
+type ValueBytes []byte
+
 // Value is a logical index into a Row2. For efficiency reasons, use sparingly.
 type Value struct {
-	Val ValueBytes
-	Typ querypb.Type
+	Val  ValueBytes
+	Val2 AnyWrapper
+	Typ  querypb.Type // TODO: consider sqltypes.Type instead
 }
 
 // IsNull returns whether this value represents NULL
 func (v Value) IsNull() bool {
 	return v.Val == nil || v.Typ == querypb.Type_NULL_TYPE
 }
 
-type ValueBytes []byte
-
 type RowFrame struct {
 	Types []querypb.Type