From 6a8d1d799c7dce98da4e9aec0cd31b8d013d6a6a Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Thu, 27 Apr 2023 20:35:51 +0800 Subject: [PATCH] pkg/sink(ticdc): resolve conflicts --- tests/integration_tests/run_group.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration_tests/run_group.sh b/tests/integration_tests/run_group.sh index 27ae783cd18..3c51e8ec76c 100755 --- a/tests/integration_tests/run_group.sh +++ b/tests/integration_tests/run_group.sh @@ -48,7 +48,7 @@ groups=( ["G12"]='changefeed_fast_fail tidb_mysql_test server_config_compatibility' ["G13"]='resourcecontrol processor_etcd_worker_delay' ["G14"]='batch_update_to_no_batch gc_safepoint changefeed_pause_resume' - ["G15"]='cli simple cdc_server_tips changefeed_resume_with_checkpoint_ts' + ["G15"]='cli simple cdc_server_tips changefeed_resume_with_checkpoint_ts lossy_ddl' ["G16"]='processor_err_chan resolve_lock move_table autorandom' ["G17"]='ddl_attributes many_pk_or_uk capture_session_done_during_task' ["G18"]='tiflash new_ci_collation_without_old_value region_merge common_1' @@ -56,7 +56,7 @@ groups=( ["G20"]='changefeed_reconstruct http_proxies savepoint' ["G21"]='event_filter generate_column sequence processor_resolved_ts_fallback' ["G22"]='big_txn changefeed_finish sink_hang' - ["G23"]='new_ci_collation_with_old_value batch_add_table lossy_ddl' + ["G23"]='new_ci_collation_with_old_value batch_add_table ' ["G24"]='owner_resign force_replicate_table multi_changefeed' )