Merge remote-tracking branch 'pingcap/master' into kafka_batch

# Conflicts: # tests/_utils/run_kafka_consumer # tests/cdc/run.sh # tests/multi_capture/run.sh # tests/row_format/run.sh # tests/simple/run.sh # tests/split_region/run.sh
pingcap · Mar 19, 2020 · 22bece3 · 22bece3
2 parents 79b9e4b + 9b918e7
commit 22bece3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/tests/cdc/run.sh b/tests/cdc/run.sh
@@ -23,8 +23,8 @@ function prepare() {
 
     TOPIC_NAME="ticdc-cdc-test-$RANDOM"
     case $SINK_TYPE in
-        mysql) SINK_URI="mysql://root@127.0.0.1:3306/";;
         kafka) SINK_URI="kafka://127.0.0.1:9092/$TOPIC_NAME?partition-num=4";;
+        mysql) ;&
         *) SINK_URI="mysql://root@127.0.0.1:3306/";;
     esac
     cdc cli changefeed create --start-ts=$start_ts --sink-uri="$SINK_URI"

diff --git a/tests/multi_capture/run.sh b/tests/multi_capture/run.sh
@@ -35,8 +35,8 @@ function run() {
 
     TOPIC_NAME="ticdc-multi-capture-test-$RANDOM"
     case $SINK_TYPE in
-        mysql) SINK_URI="mysql://root@127.0.0.1:3306/";;
         kafka) SINK_URI="kafka://127.0.0.1:9092/$TOPIC_NAME?partition-num=4";;
+        mysql) ;&
         *) SINK_URI="mysql://root@127.0.0.1:3306/";;
     esac
     cdc cli changefeed create --start-ts=$start_ts --sink-uri="$SINK_URI"

diff --git a/tests/row_format/run.sh b/tests/row_format/run.sh
@@ -22,8 +22,8 @@ function run() {
 
     TOPIC_NAME="ticdc-row-format-test-$RANDOM"
     case $SINK_TYPE in
-        mysql) SINK_URI="mysql://root@127.0.0.1:3306/";;
         kafka) SINK_URI="kafka://127.0.0.1:9092/$TOPIC_NAME?partition-num=4";;
+        mysql) ;&
         *) SINK_URI="mysql://root@127.0.0.1:3306/";;
     esac
     cdc cli changefeed create --start-ts=$start_ts --sink-uri="$SINK_URI"

diff --git a/tests/simple/run.sh b/tests/simple/run.sh
@@ -25,8 +25,8 @@ function prepare() {
 
     TOPIC_NAME="ticdc-simple-test-$RANDOM"
     case $SINK_TYPE in
-        mysql) SINK_URI="mysql://root@127.0.0.1:3306/";;
         kafka) SINK_URI="kafka://127.0.0.1:9092/$TOPIC_NAME?partition-num=4";;
+        mysql) ;&
         *) SINK_URI="mysql://root@127.0.0.1:3306/";;
     esac
     cdc cli changefeed create --start-ts=$start_ts --sink-uri="$SINK_URI"

diff --git a/tests/split_region/run.sh b/tests/split_region/run.sh
@@ -24,8 +24,8 @@ function run() {
 
     TOPIC_NAME="ticdc-split-region-test-$RANDOM"
     case $SINK_TYPE in
-        mysql) SINK_URI="mysql://root@127.0.0.1:3306/";;
         kafka) SINK_URI="kafka://127.0.0.1:9092/$TOPIC_NAME?partition-num=4";;
+        mysql) ;&
         *) SINK_URI="mysql://root@127.0.0.1:3306/";;
     esac
     cdc cli changefeed create --start-ts=$start_ts --sink-uri="$SINK_URI"