diff --git a/executor/brie.go b/executor/brie.go index c5ba91e6ba4dc..7bbff28d541c0 100644 --- a/executor/brie.go +++ b/executor/brie.go @@ -51,7 +51,7 @@ import ( const ( defaultCapOfCreateTable = 512 defaultCapOfCreateDatabase = 64 - brViaSQLComment = `/*from(br_via_sql)*/` + brViaSQLComment = `/*from(br)*/` ) // brieTaskProgress tracks a task's current progress. @@ -413,6 +413,9 @@ func (gs *tidbGlueSession) CreateSession(store kv.Storage) (glue.Session, error) // Execute implements glue.Session func (gs *tidbGlueSession) Execute(ctx context.Context, sql string) error { // FIXME: br relies on a deprecated API, it may be unsafe + if !strings.Contains(sql, brViaSQLComment) { + sql = brViaSQLComment + sql + } _, err := gs.se.(sqlexec.SQLExecutor).Execute(ctx, sql) return err } diff --git a/session/session_test.go b/session/session_test.go index 492114fb161dd..e371ad2384613 100644 --- a/session/session_test.go +++ b/session/session_test.go @@ -3738,8 +3738,8 @@ func (s *testBackupRestoreSuite) TestBackupAndRestore(c *C) { jsBytes, err := json.MarshalIndent(jobs, "", " ") c.Assert(err, IsNil) jsStr := string(jsBytes) - c.Assert(strings.Contains(jsStr, "/*from(br_via_sql)*/CREATE TABLE"), IsTrue) - c.Assert(strings.Contains(jsStr, "/*from(br_via_sql)*/CREATE DATABASE"), IsTrue) + c.Assert(strings.Contains(jsStr, "/*from(br)*/CREATE TABLE"), IsTrue) + c.Assert(strings.Contains(jsStr, "/*from(br)*/CREATE DATABASE"), IsTrue) } }