*(all): update dependencies on tidb and pd.

Makefile

@@ -40,14 +40,26 @@ ifeq (${CDC_ENABLE_VENDOR}, 1)
 GOVENDORFLAG := -mod=vendor
 endif
 
-GOBUILD  := CGO_ENABLED=0 $(GO) build $(BUILD_FLAG) -trimpath $(GOVENDORFLAG)
-GOBUILDNOVENDOR  := CGO_ENABLED=0 $(GO) build $(BUILD_FLAG) -trimpath
-GOTEST   := CGO_ENABLED=1 $(GO) test -p $(P) --race
-GOTESTNORACE := CGO_ENABLED=1 $(GO) test -p $(P)
-
+OS    := "$(shell go env GOOS)"
 ARCH  := "$(shell uname -s)"
 LINUX := "Linux"
 MAC   := "Darwin"
+ifeq (${ARCH}, ${LINUX})
+	CGO := 0
+else ifeq (${OS}, "linux")
+	CGO := 0
+else ifeq (${ARCH}, ${MAC})
+	CGO := 1
+else ifeq (${OS}, "darwin")
+	CGO := 1
+endif
+
+GOBUILD  := CGO_ENABLED=$(CGO) $(GO) build $(BUILD_FLAG) -trimpath $(GOVENDORFLAG)
+GOBUILDNOVENDOR  := CGO_ENABLED=0 $(GO) build $(BUILD_FLAG) -trimpath
+GOTEST   := CGO_ENABLED=1 $(GO) test -p $(P) --race --tags=intest
+GOTESTNORACE := CGO_ENABLED=1 $(GO) test -p $(P)
+
+
 CDC_PKG := github.com/pingcap/tiflow
 DM_PKG := github.com/pingcap/tiflow/dm
 ENGINE_PKG := github.com/pingcap/tiflow/engine
@@ -163,7 +175,7 @@ unit_test_in_verify_ci: check_failpoint_ctl tools/bin/gotestsum tools/bin/gocov
 	mkdir -p "$(TEST_DIR)"
 	$(FAILPOINT_ENABLE)
 	@export log_level=error;\
-	CGO_ENABLED=1 tools/bin/gotestsum --junitfile cdc-junit-report.xml -- -v -timeout 5m -p $(P) --race \
+	CGO_ENABLED=1 tools/bin/gotestsum --junitfile cdc-junit-report.xml -- -v -timeout 5m -p $(P) --race --tags=intest \
 	-covermode=atomic -coverprofile="$(TEST_DIR)/cov.unit.out" $(PACKAGES_TICDC) \
 	|| { $(FAILPOINT_DISABLE); exit 1; }
 	tools/bin/gocov convert "$(TEST_DIR)/cov.unit.out" | tools/bin/gocov-xml > cdc-coverage.xml

cdc/api/v2/changefeed_test.go

@@ -321,7 +321,7 @@ func TestUpdateChangefeed(t *testing.T) {
 	cp.EXPECT().IsOwner().Return(true).AnyTimes()
 
 	// case 1 invalid id
-	invalidID := "#Invalid_"
+	invalidID := "Invalid_#"
 	w := httptest.NewRecorder()
 	req, _ := http.NewRequestWithContext(context.Background(), update.method,
 		fmt.Sprintf(update.url, invalidID), nil)

cdc/entry/schema/snapshot.go

@@ -30,7 +30,9 @@ import (
 	"github.com/pingcap/tidb/parser/mysql"
 	"github.com/pingcap/tidb/session"
 	"github.com/pingcap/tiflow/cdc/model"
+	"github.com/pingcap/tiflow/pkg/config"
 	cerror "github.com/pingcap/tiflow/pkg/errors"
+	"github.com/pingcap/tiflow/pkg/filter"
 	"go.uber.org/zap"
 )
 
@@ -527,13 +529,28 @@ func (s *Snapshot) SchemaCount() (count int) {
 
 // DumpToString dumps the snapshot to a string.
 func (s *Snapshot) DumpToString() string {
+	// TiCDC will not use any table in system database,
+	// so we can ignore them.
+	cfg := config.GetDefaultReplicaConfig()
+	cfg.Filter.Rules = []string{"mysql.*"}
+	ft, err := filter.NewFilter(cfg, "")
+	if err != nil {
+		log.Panic("new filter error", zap.Error(err))
+	}
+
 	schemas := make([]string, 0, s.inner.schemas.Len())
 	s.IterSchemas(func(dbInfo *timodel.DBInfo) {
+		if ft.ShouldIgnoreTable(dbInfo.Name.O, "") {
+			return
+		}
 		schemas = append(schemas, fmt.Sprintf("%v", dbInfo))
 	})
 
 	tables := make([]string, 0, s.inner.tables.Len())
 	s.IterTables(true, func(tbInfo *model.TableInfo) {
+		if ft.ShouldIgnoreTable(tbInfo.TableName.Schema, tbInfo.TableName.Schema) {
+			return
+		}
 		tables = append(tables, fmt.Sprintf("%v", tbInfo))
 	})
 
@@ -544,12 +561,18 @@ func (s *Snapshot) DumpToString() string {
 
 	schemaNames := make([]string, 0, s.inner.schemaNameToID.Len())
 	s.IterSchemaNames(func(schema string, target int64) {
+		if ft.ShouldIgnoreTable(schema, "") {
+			return
+		}
 		schemaNames = append(schemaNames, fmt.Sprintf("%s:%d", schema, target))
 	})
 
 	tableNames := make([]string, 0, s.inner.tableNameToID.Len())
 	s.IterTableNames(func(schemaID int64, table string, target int64) {
 		schema, _ := s.inner.schemaByID(schemaID)
+		if ft.ShouldIgnoreTable(schema.Name.O, table) {
+			return
+		}
 		tableNames = append(tableNames, fmt.Sprintf("%s.%s:%d", schema.Name.O, table, target))
 	})
 

cdc/entry/schema_storage_test.go

@@ -734,7 +734,7 @@ func TestExplicitTables(t *testing.T) {
 	require.GreaterOrEqual(t, snap2.TableCount(false), 4)
 
 	require.Equal(t, snap3.TableCount(true)-snap1.TableCount(true), 5)
-	require.Equal(t, snap3.TableCount(false), 45)
+	require.Equal(t, 51, snap3.TableCount(false))
 }
 
 /*

cdc/owner/schema_test.go

@@ -95,7 +95,7 @@ func TestAllTables(t *testing.T) {
 	require.Equal(t, tableName, model.TableName{
 		Schema:  "test",
 		Table:   "t1",
-		TableID: 76,
+		TableID: 84,
 	})
 	// add ineligible table
 	require.Nil(t, schema.HandleDDL(helper.DDL2Job("create table test.t2(id int)")))
@@ -104,7 +104,7 @@ func TestAllTables(t *testing.T) {
 	require.Equal(t, tableName, model.TableName{
 		Schema:  "test",
 		Table:   "t1",
-		TableID: 76,
+		TableID: 84,
 	})
 }
 

cdc/server/server_test.go

@@ -40,7 +40,7 @@ import (
 	"github.com/pingcap/tiflow/pkg/security"
 	"github.com/pingcap/tiflow/pkg/util"
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/embed"
 	"golang.org/x/sync/errgroup"

cdc/sink/codec/maxwell/maxwell_message.go

@@ -21,7 +21,7 @@ import (
 	"github.com/pingcap/tiflow/cdc/model"
 	"github.com/pingcap/tiflow/cdc/sink/codec/internal"
 	cerror "github.com/pingcap/tiflow/pkg/errors"
-	"github.com/tikv/pd/pkg/tsoutil"
+	"github.com/tikv/pd/pkg/utils/tsoutil"
 )
 
 type maxwellMessage struct {

dm/master/election_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/pingcap/tiflow/dm/pkg/etcdutil"
 	"github.com/pingcap/tiflow/dm/pkg/log"
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 )
 
 func TestFailToStartLeader(t *testing.T) {

dm/master/etcd_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/pingcap/tiflow/dm/pkg/log"
 	"github.com/pingcap/tiflow/dm/pkg/terror"
 	"github.com/pingcap/tiflow/dm/pkg/utils"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/embed"
 )

dm/master/openapi_view_test.go

@@ -43,7 +43,7 @@ import (
 	"github.com/pingcap/tiflow/dm/pkg/utils"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 )
 
 // some data for test.

dm/master/server_test.go

@@ -66,7 +66,7 @@ import (
 	"github.com/pingcap/tiflow/pkg/version"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/verify"
 	"go.etcd.io/etcd/tests/v3/integration"

dm/master/workerrpc/workerrpc_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/pingcap/tiflow/dm/pb"
 	"github.com/pingcap/tiflow/dm/pbmock"
 	"github.com/pingcap/tiflow/dm/pkg/terror"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 )
 
 var _ = Suite(&testWorkerRPCSuite{})

dm/pkg/election/election_test.go

@@ -27,7 +27,7 @@ import (
 	"github.com/pingcap/tiflow/dm/pkg/log"
 	"github.com/pingcap/tiflow/dm/pkg/terror"
 	"github.com/pingcap/tiflow/dm/pkg/utils"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/embed"
 )

dm/pkg/etcdutil/etcdutil_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/pingcap/tiflow/dm/pkg/log"
 	"github.com/pingcap/tiflow/dm/pkg/terror"
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	clientv3 "go.etcd.io/etcd/client/v3"

dm/pkg/retry/errors.go

@@ -36,17 +36,17 @@ var (
 		"Unsupported collation",
 		"Invalid default value for",
 		"Unsupported drop primary key",
-		"Error 1059: Identifier name", // Limitations on identifier length
-		"Error 1117: Too many columns",
-		"Error 1069: Too many keys specified",
+		"Error 1059",
+		"Error 1117",
+		"Error 1069",
 	}
 
 	// UnsupportedDMLMsgs list the error messages of some un-recoverable DML, which is used in task auto recovery.
 	UnsupportedDMLMsgs = []string{
-		"Error 1062: Duplicate",
-		"Error 1406: Data too long for column",
+		"Error 1062",
+		"Error 1406",
 		"Error 1366",
-		"Error 8025: entry too large",
+		"Error 8025",
 	}
 
 	// ReplicationErrMsgs list the error message of un-recoverable replication error.

dm/tests/all_mode/run.sh

@@ -552,7 +552,7 @@ function run() {
 	run_sql_source1 "create table all_mode.db_error (c int primary key);"
 	run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"query-status $ILLEGAL_CHAR_NAME" \
-		"Error 1049: Unknown database" 1
+		"Error 1049 (42000): Unknown database" 1
 
 	# stop task, task state should be cleaned
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \

dm/tests/check_task/run.sh

@@ -51,7 +51,7 @@ function test_privileges_can_migrate() {
 	run_sql_source1 "create table checktask1.test_privilege(id int primary key, b varchar(10))"
 	run_sql_source1 "insert into checktask1.test_privilege values (1, 'a'),(2, 'b');"
 	run_sql_tidb "create user 'test1'@'%' identified by '123456';"
-	run_sql_tidb "grant select, create, insert, update, delete, alter, drop, index on *.* to 'test1'@'%';"
+	run_sql_tidb "grant select, create, insert, update, delete, alter, drop, index, config on *.* to 'test1'@'%';"
 	run_sql_tidb "flush privileges;"
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"start-task $cur/conf/task-priv.yaml --remove-meta" \

dm/tests/full_mode/run.sh

@@ -53,8 +53,8 @@ function fail_acquire_global_lock() {
 	run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"query-status test" \
 		"\"stage\": \"Paused\"" 2 \
-		"LOCK TABLES \`full_mode\`.\`t1\` READ: Error 1044: Access denied" 1 \
-		"LOCK TABLES \`full_mode\`.\`t2\` READ: Error 1044: Access denied" 1
+		"LOCK TABLES \`full_mode\`.\`t1\` READ: Error 1044 (42000): Access denied" 1 \
+		"LOCK TABLES \`full_mode\`.\`t2\` READ: Error 1044 (42000): Access denied" 1
 
 	cleanup_process $*
 	cleanup_data full_mode

dm/tests/handle_error/run.sh

@@ -521,7 +521,7 @@ function DM_EXEC_ERROR_SKIP_CASE() {
 
 	run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"query-status test" \
-		"Error 1062: Duplicate " 1
+		"Error 1062 (23000): Duplicate " 1
 
 	run_sql_tidb "insert into ${db}.${tb} values(5,3,3);"
 	run_sql_tidb "insert into ${db}.${tb} values(6,4,4);"

dm/tests/lightning_mode/run.sh

@@ -78,8 +78,7 @@ function run() {
 		"checksum mismatched, KV number in source files: 6, KV number in TiDB cluster: 3" 1 \
 		'"unit": "Load"' 2
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
-		"resume-task test" \
-		"\"result\": true" 3
+		"resume-task test"
 	run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"query-status test" \
 		'unit": "Sync"' 2

dm/tests/many_tables/run.sh

@@ -103,7 +103,7 @@ function run() {
 	run_sql_tidb "select count(*) from dm_meta.test_syncer_checkpoint"
 	check_contains "count(*): $(($TABLE_NUM + 1))"
 
-	check_log_contains $WORK_DIR/worker1/log/dm-worker.log 'Error 8004: Transaction is too large'
+	check_log_contains $WORK_DIR/worker1/log/dm-worker.log 'Error 8004 (HY000): Transaction is too large'
 
 	# check https://github.com/pingcap/tiflow/issues/5063
 	check_time=100

dm/tests/print_status/run.sh

@@ -74,7 +74,7 @@ function check_print_status() {
 
 	# check load unit print status
 	status_file=$WORK_DIR/worker1/log/loader_status.log
-	grep -oP "\[unit=lightning-load\] \[IsCanceled=false\] \[finished_bytes=59637\] \[total_bytes=59637\] \[progress=.*\]" $WORK_DIR/worker1/log/dm-worker.log >$status_file
+	grep -oP "\[unit=lightning-load\] \[IsCanceled=false\] \[finished_bytes=59834\] \[total_bytes=59834\] \[progress=.*\]" $WORK_DIR/worker1/log/dm-worker.log >$status_file
 	status_count=$(wc -l $status_file | awk '{print $1}')
 	[ $status_count -eq 1 ]
 	# must have a non-zero speed in log

dm/tests/shardddl1_1/run.sh

@@ -253,7 +253,7 @@ function DM_027_CASE() {
 	run_sql_source1 "insert into ${shardddl1}.${tb3} values (5,6)"
 	run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"query-status test" \
-		"Error 1054: Unknown column 'val' in 'field list'" 1
+		"Error 1054 (42S22): Unknown column 'val' in 'field list'" 1
 }
 
 function DM_027() {

dm/tests/sync_collation/run.sh

@@ -100,8 +100,8 @@ function run() {
 	echo "check full phase error"
 	run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"query-status ${TASK_NAME}" \
-		"Error 1273: Unsupported collation when new collation is enabled: 'latin1_swedish_ci'" 1 \
-		"Error 1273: Unsupported collation when new collation is enabled: 'utf8mb4_0900_ai_ci'" 1
+		"Error 1273 (HY000): Unsupported collation when new collation is enabled: 'latin1_swedish_ci'" 1 \
+		"Error 1273 (HY000): Unsupported collation when new collation is enabled: 'utf8mb4_0900_ai_ci'" 1
 
 	dmctl_stop_task $TASK_NAME $MASTER_PORT
 
@@ -118,8 +118,8 @@ function run() {
 	echo "check incremental phase error"
 	run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"query-status ${TASK_NAME}" \
-		"Error 1273: Unsupported collation when new collation is enabled: 'latin1_swedish_ci'" 1 \
-		"Error 1273: Unsupported collation when new collation is enabled: 'utf8mb4_0900_ai_ci'" 1
+		"Error 1273 (HY000): Unsupported collation when new collation is enabled: 'latin1_swedish_ci'" 1 \
+		"Error 1273 (HY000): Unsupported collation when new collation is enabled: 'utf8mb4_0900_ai_ci'" 1
 }
 
 cleanup_data $TEST_NAME

dm/tests/tracker_ignored_ddl/run.sh

@@ -36,7 +36,7 @@ function run() {
 	run_sql_file $cur/data/db.increment2.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1
 	run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"query-status test" \
-		"Error 1054: Unknown column" 1
+		"Error 1054 (42S22): Unknown column" 1
 
 	# force a resume, the error is still there, but we want to check https://github.com/pingcap/tiflow/issues/5272#issuecomment-1109283279
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \

dm/unit/unit_test.go

@@ -73,7 +73,7 @@ func TestIsResumableError(t *testing.T) {
 		{terror.ErrDBExecuteFailed.Delegate(&tmysql.SQLError{Code: 1105, Message: "unsupported modify column length 20 is less than origin 40", State: tmysql.DefaultMySQLState}, "alter table t modify col varchar(20)"), false},
 		{terror.ErrDBExecuteFailed.Delegate(&tmysql.SQLError{Code: 1105, Message: "unsupported drop integer primary key", State: tmysql.DefaultMySQLState}, "alter table t drop column id"), false},
 		{terror.ErrDBExecuteFailed.Delegate(&tmysql.SQLError{Code: 1067, Message: "Invalid default value for 'ct'", State: tmysql.DefaultMySQLState}, "CREATE TABLE `tbl` (`c1` int(11) NOT NULL,`ct` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '创建时间',PRIMARY KEY (`c1`)) ENGINE=InnoDB DEFAULT CHARSET=latin1"), false},
-		{terror.ErrDBExecuteFailed.Delegate(errors.New("Error 1062: Duplicate entry '5' for key 'PRIMARY'")), false},
+		{terror.ErrDBExecuteFailed.Delegate(errors.New("Error 1062 (23000): Duplicate entry '5' for key 'PRIMARY'")), false},
 		{terror.ErrDBExecuteFailed.Delegate(errors.New("INSERT INTO `db`.`tbl` (`c1`,`c2`) VALUES (?,?);: Error 1406: Data too long for column 'c2' at row 1")), false},
 		// real error is generated by `Delegate` and multiple `Annotatef`, we use `New` to simplify it
 		{terror.ErrParserParseRelayLog.New("parse relay log file bin.000018 from offset 555 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file bin.000018 from offset 0 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004/bin.000018: binlog checksum mismatch, data may be corrupted"), false},

dm/worker/server_test.go

@@ -37,7 +37,7 @@ import (
 	"github.com/pingcap/tiflow/dm/relay"
 	"github.com/pingcap/tiflow/dm/unit"
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 	v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/embed"

dm/worker/source_worker_test.go

@@ -36,7 +36,7 @@ import (
 	"github.com/pingcap/tiflow/dm/syncer"
 	"github.com/pingcap/tiflow/dm/unit"
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 

engine/test/integration_tests/dm_collation/run.sh

@@ -39,7 +39,7 @@ function run() {
 	# wait for dump and load finished
 
 	exec_with_retry --count 30 "curl \"http://127.0.0.1:10245/api/v1/jobs/$job_id/status\" | tee /dev/stderr | jq -e '.task_status.\"mysql-01\".status.unit == \"DMSyncTask\" and .task_status.\"mysql-02\".status.unit == \"DMSyncTask\"'"
-	curl http://127.0.0.1:10245/api/v1/jobs/$job_id/status | tee /dev/stderr | jq -e '.finished_unit_status."mysql-02"[1].Status.finishedBytes == 174'
+	curl http://127.0.0.1:10245/api/v1/jobs/$job_id/status | tee /dev/stderr | jq -e '.finished_unit_status."mysql-02"[1].Status.finishedBytes == 248'
 
 	# check data
 

engine/test/integration_tests/dm_full_mode/run.sh

@@ -55,10 +55,10 @@ function run() {
 
 	# create job & wait for job finished
 	job_id=$(create_job "DM" "$CUR_DIR/conf/job.yaml" "dm_full_mode")
-	exec_with_retry --count 30 "curl \"http://127.0.0.1:10245/api/v1/jobs/$job_id/status\" | tee /dev/stderr | grep -q 'Error 1142: ALTER command denied'"
+	exec_with_retry --count 30 "curl \"http://127.0.0.1:10245/api/v1/jobs/$job_id/status\" | tee /dev/stderr | grep -q 'Error 1142 (42000): ALTER command denied'"
 	docker restart server-executor-0 server-executor-1 server-executor-2
 	# check the error is not related to lightning checkpoint
-	exec_with_retry --count 60 "curl \"http://127.0.0.1:10245/api/v1/jobs/$job_id/status\" | tee /dev/stderr | grep -q 'Error 1142: ALTER command denied'"
+	exec_with_retry --count 60 "curl \"http://127.0.0.1:10245/api/v1/jobs/$job_id/status\" | tee /dev/stderr | grep -q 'Error 1142 (42000): ALTER command denied'"
 
 	run_sql --port 4000 "GRANT ALTER ON *.* TO 'dm_full'@'%';"
 	curl -X PUT "http://127.0.0.1:10245/api/v1/jobs/$job_id/status" -H 'Content-Type: application/json' -d '{"op": "resume"}'