update

.github/workflows/ninja.yml

@@ -1,4 +1,4 @@
-name: ninja-CMake
+name: ninja
 on: [push, pull_request]
 
 jobs:
@@ -30,7 +30,7 @@ jobs:
         run: |
             echo "$PWD/install_dir/bin" >> $GITHUB_PATH
             cat $GITHUB_PATH
-      - id: actions-setup-server-windows
+      - name: setup-server (Windows)
         if:  ${{ contains(matrix.os, 'windows') }}
         uses: shogo82148/actions-setup-mysql@v1
         env:
@@ -39,25 +39,23 @@ jobs:
         with:
           distribution: ${{ matrix.mysql-distribution }}
           my-cnf: |
-            innodb_log_file_size=4G
+            ${{ matrix.mysql-distribution == 'mysql' && 'innodb_redo_log_capacity' || 'innodb_log_file_size' }}=4G
             innodb_buffer_pool_size=512MB
             max_allowed_packet=16MB
             skip-log-bin
-            loose-enable-named-pipe
+            enable-named-pipe
             socket=/tmp/mysql.sock
             max_connections=1000
-      - id: setup-mysql
-        name: setup-server-non-windows
+      - name: setup-server (non-Windows)
         if:  ${{ !contains(matrix.os, 'windows') }}
         uses: shogo82148/actions-setup-mysql@v1
         with:
           distribution: ${{ matrix.mysql-distribution }}
           my-cnf: |
-            innodb_log_file_size=4G
+            ${{ matrix.mysql-distribution == 'mysql' && 'innodb_redo_log_capacity' || 'innodb_log_file_size' }}=4G
             innodb_buffer_pool_size=512MB
             max_allowed_packet=16MB
             skip-log-bin
-            loose-enable-named-pipe
             socket=/tmp/mysql.sock
             max_connections=1000
       - name: create database sbtest
@@ -75,13 +73,13 @@ jobs:
             mysql -uroot -e "set global innodb_flush_log_at_trx_commit=2"
             sysbench oltp_update_index --mysql-user=root --mysql-socket=/tmp/mysql.sock --time=60 --table-size=100000 --threads=1  --report-interval=1 --histogram run
             mysql -uroot -e "set global innodb_flush_log_at_trx_commit=1"
-      - name: sysbench oltp_update_index run
+      - name: sysbench oltp_update_index run 40 threads
         run: sysbench oltp_update_index --mysql-user=root --mysql-socket=/tmp/mysql.sock --time=60  --table-size=100000 --threads=40  --report-interval=1 --histogram run
       - name: sysbench oltp cleanup
         run: sysbench oltp_read_write --mysql-host=127.0.0.1 --mysql-port=3306 --mysql-user=root cleanup
       - name: fileio seqrewr prepare
-        run: sysbench fileio --file-block-size=4096  --file-test-mode=seqrewr --file-fsync-mode=fdatasync --file-fsync-all=on --file-num=1 --report-interval=1 --time=60 --histogram prepare
-      - name: fileio seqrewr run
+        run: sysbench fileio --file-block-size=4096  --file-test-mode=seqrewr  --file-num=1 prepare
+      - name: fileio seqrewr run fdatasync
         run: sysbench fileio --file-block-size=4096  --file-test-mode=seqrewr --file-fsync-mode=fdatasync --file-fsync-all=on --file-num=1 --report-interval=1 --time=60 --histogram run
       - name: fileio seqrewr run fsync
         run: sysbench fileio --file-block-size=4096  --file-test-mode=seqrewr --file-fsync-mode=fsync --file-fsync-all=on --file-num=1 --report-interval=1 --time=60 --histogram run

.github/workflows/windows.yml

@@ -8,9 +8,6 @@ jobs:
         os: [windows-latest]
     runs-on: ${{ matrix.os }}
     name: Build on ${{ matrix.os }}
-    env:
-      TMP: D:\
-      TEMP: D:\
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -42,6 +39,9 @@ jobs:
         run: sysbench --help
       - name: actions-setup-mysql
         uses: shogo82148/[email protected]
+        env:
+          TMP: D:\
+          TEMP: D:\
         with:
           mysql-version: 'mariadb-10.9'
           my-cnf: |
@@ -57,18 +57,6 @@ jobs:
           username: sbtest
           password: sbtest
           database: sbtest
-      - name: fsinfo
-        run: |
-          fsutil fsinfo drives
-          fsutil fsinfo drivetype A:
-          fsutil fsinfo drivetype C:
-          fsutil fsinfo drivetype D:
-          fsutil fsinfo ntfsinfo C:
-          fsutil fsinfo ntfsinfo D:
-          fsutil fsinfo statistics C:
-          fsutil fsinfo statistics D:
-          fsutil fsinfo volumeinfo C:
-          fsutil fsinfo statistics D:
       - name: create database sbtest
         run: mysql -uroot -e "create database sbtest"
       - name: sysbench oltp_update_index prepare