Skip to content

Commit 089a598

Browse files
authored
Merge pull request #41 from major/master
rebase 2
2 parents 10fcd37 + d430513 commit 089a598

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/workflows/docker_publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
uses: actions/checkout@v6
1616

1717
- name: Set up Docker Buildx
18-
uses: docker/setup-buildx-action@v3
18+
uses: docker/setup-buildx-action@v4
1919

2020
- name: Log in to Docker Hub
21-
uses: docker/login-action@v3
21+
uses: docker/login-action@v4
2222
with:
2323
username: ${{ secrets.DOCKER_USER_LOGIN }}
2424
password: ${{ secrets.DOCKER_USER_PASSWORD }}
@@ -64,7 +64,7 @@ jobs:
6464
} >> $GITHUB_ENV
6565
6666
- name: Build and push Docker image
67-
uses: docker/build-push-action@v6
67+
uses: docker/build-push-action@v7
6868
with:
6969
context: .
7070
push: true

.github/workflows/publish_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@v6
1616

1717
- name: Create Release and Upload Assets
18-
uses: softprops/action-gh-release@v2
18+
uses: softprops/action-gh-release@v3
1919
with:
2020
files: |
2121
mysqltuner.pl

mysqltuner.pl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6088,7 +6088,8 @@ sub mysql_myisam {
60886088
)
60896089
)
60906090
{
6091-
my $myisam_table_escape = $myisam_table =~ s/\|/\`/gr;
6091+
my $myisam_table_escape = $myisam_table;
6092+
$myisam_table_escape =~ s/\|/\`/g;
60926093
$sql_mig =
60936094
"${sql_mig}-- InnoDB migration for $myisam_table_escape\nALTER TABLE $myisam_table_escape ENGINE=InnoDB;\n\n";
60946095
infoprint
@@ -10895,7 +10896,11 @@ sub which {
1089510896
my $prog_name = shift;
1089610897
my $path_string = shift;
1089710898
my @path_array = split /:/, $ENV{'PATH'};
10898-
if ($is_win) { @path_array = split /;/, $ENV{'PATH'} =~ s/\\/\//gr; }
10899+
if ($is_win) {
10900+
my $path_env = $ENV{'PATH'};
10901+
$path_env =~ s/\\/\//g;
10902+
@path_array = split /;/, $path_env;
10903+
}
1089910904

1090010905
for my $path (@path_array) {
1090110906
if ($is_win) {

0 commit comments

Comments
 (0)