Merge branch 'main' into check_pid_when_attaching_uprobe

hengyoush · Feb 13, 2025 · 7cedcce · 7cedcce
2 parents 6486259 + e91087a
commit 7cedcce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/testdata/test_mysql.sh b/testdata/test_mysql.sh
@@ -25,7 +25,7 @@ function test_mysql_server() {
 
     cname='test-mysql'
     docker rm -f $cname || true
-    cid1=$(docker run --name $cname -e MYSQL_ROOT_PASSWORD=123456  -p 3306:3306 -v /opt/docker_v/mysql/conf:/etc/mysql/conf.d -d "$IMAGE_NAME")
+    cid1=$(docker run --name $cname -e MYSQL_ROOT_PASSWORD=123456 -e MYSQL_ROOT_HOST=%  -p 3306:3306 -v /opt/docker_v/mysql/conf:/etc/mysql/conf.d -d "$IMAGE_NAME")
     export cid1
     echo $cid1
 
@@ -57,7 +57,7 @@ function test_mysql_client() {
 
     cname='test-mysql'
     docker rm -f $cname || true
-    cid1=$(docker run --name $cname -e MYSQL_ROOT_PASSWORD=123456  -p 3306:3306 -v /opt/docker_v/mysql/conf:/etc/mysql/conf.d -d "$IMAGE_NAME")
+    cid1=$(docker run --name $cname -e MYSQL_ROOT_PASSWORD=123456 -e MYSQL_ROOT_HOST=%  -p 3306:3306 -v /opt/docker_v/mysql/conf:/etc/mysql/conf.d -d "$IMAGE_NAME")
     export cid1
     echo $cid1
 

diff --git a/testdata/test_side.sh b/testdata/test_side.sh
@@ -24,7 +24,7 @@ function test_side_client_match() {
 
     cname='test-mysql'
     docker rm -f $cname || true
-    cid1=$(docker run --name $cname -e MYSQL_ROOT_PASSWORD=123456  -p 3306:3306 -v /opt/docker_v/mysql/conf:/etc/mysql/conf.d -d "$IMAGE_NAME")
+    cid1=$(docker run --name $cname -e MYSQL_ROOT_PASSWORD=123456 -e MYSQL_ROOT_HOST=%  -p 3306:3306 -v /opt/docker_v/mysql/conf:/etc/mysql/conf.d -d "$IMAGE_NAME")
     export cid1
     echo $cid1
 
@@ -56,7 +56,7 @@ function test_side_client_nonmatch() {
 
     cname='test-mysql'
     docker rm -f $cname || true
-    cid1=$(docker run --name $cname -e MYSQL_ROOT_PASSWORD=123456  -p 3306:3306 -v /opt/docker_v/mysql/conf:/etc/mysql/conf.d -d "$IMAGE_NAME")
+    cid1=$(docker run --name $cname -e MYSQL_ROOT_PASSWORD=123456 -e MYSQL_ROOT_HOST=%   -p 3306:3306 -v /opt/docker_v/mysql/conf:/etc/mysql/conf.d -d "$IMAGE_NAME")
     export cid1
     echo $cid1