Mask database name

go/vt/vttablet/tabletserver/bench_test.go

@@ -55,7 +55,7 @@ func init() {
 }
 
 func BenchmarkExecuteVarBinary(b *testing.B) {
-	db, tsv := setupTabletServerTest(nil)
+	db, tsv := setupTabletServerTest(nil, "")
 	defer db.Close()
 	defer tsv.StopService()
 
@@ -77,7 +77,7 @@ func BenchmarkExecuteVarBinary(b *testing.B) {
 }
 
 func BenchmarkExecuteExpression(b *testing.B) {
-	db, tsv := setupTabletServerTest(nil)
+	db, tsv := setupTabletServerTest(nil, "")
 	defer db.Close()
 	defer tsv.StopService()
 

go/vt/vttablet/tabletserver/tabletserver.go

@@ -643,6 +643,15 @@ func (tsv *TabletServer) Execute(ctx context.Context, target *querypb.Target, sq
 				return err
 			}
 			result = result.StripMetadata(sqltypes.IncludeFieldsOrDefault(options))
+
+			// Change database name in mysql output to the keyspace name
+			if sqltypes.IncludeFieldsOrDefault(options) == querypb.ExecuteOptions_ALL {
+				for _, f := range result.Fields {
+					if f.Database != "" {
+						f.Database = tsv.sm.target.Keyspace
+					}
+				}
+			}
 			return nil
 		},
 	)
@@ -678,7 +687,18 @@ func (tsv *TabletServer) StreamExecute(ctx context.Context, target *querypb.Targ
 				logStats:       logStats,
 				tsv:            tsv,
 			}
-			return qre.Stream(callback)
+			newCallback := func(result *sqltypes.Result) error {
+				if sqltypes.IncludeFieldsOrDefault(options) == querypb.ExecuteOptions_ALL {
+					// Change database name in mysql output to the keyspace name
+					for _, f := range result.Fields {
+						if f.Database != "" {
+							f.Database = tsv.sm.target.Keyspace
+						}
+					}
+				}
+				return callback(result)
+			}
+			return qre.Stream(newCallback)
 		},
 	)
 }