Skip to content

Commit

Permalink
Merge branch 'main' into 2024.5.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
N6REJ authored May 26, 2024
2 parents 131fb2b + 644e349 commit e0ca734
Show file tree
Hide file tree
Showing 17 changed files with 379 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ root = true

[*]
charset = utf-8
indent_size = 2
indent_size = 4
indent_style = space
end_of_line = lf
insert_final_newline = true
Expand Down
8 changes: 4 additions & 4 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
description: "For known bugs"
from_name: "bug"
- # Urgent
name: "Blocker :triangular_flag_on_post:"
color: "FFFFFF"
description: "Release blocker"
name: "Urgent :bomb:"
color: "ED7014"
description: "Urgent"
- # dependencies
name: "dependencies :man_cook:"
color: "0366d6"
Expand Down Expand Up @@ -67,7 +67,7 @@
- # Blocker
name: "Blocker :triangular_flag_on_post:"
color: "ff0000"
description: "Urgent bug, blocking release"
description: "Show Stopper"
- # Website
name: "Website :technologist:"
color: "FFFFFF"
Expand Down
10 changes: 3 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
# Jetbrains
/*.iml
/.idea
/.idea/.gitignore
/.idea/deployment.xml
/.idea/discord.xml
/.idea/module-perl.iml
/.idea/modules.xml
/.idea/php.xml
/.idea/vcs.xml

# Bearsampp
/.dev
Expand All @@ -16,3 +9,6 @@
.vscode/
.vs/
.vsc/

# ignore "current" directories
/**/current
10 changes: 10 additions & 0 deletions bin/mysql8.0.33/bearsampp.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
mysqlVersion = "8.0.33"
mysqlExe = "bin/mysqld.exe"
mysqlCliExe = "bin/mysql.exe"
mysqlAdmin = "bin/mysqladmin.exe"
mysqlConf = "my.ini"
mysqlPort = "3306"
mysqlRootUser = "root"
mysqlRootPwd = ""

bundleRelease = "@RELEASE_VERSION@"
3 changes: 3 additions & 0 deletions bin/mysql8.0.33/init.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@ECHO OFF

%~dp0bin\mysqld.exe --initialize-insecure
55 changes: 55 additions & 0 deletions bin/mysql8.0.33/my.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[client]
port = 3306
socket = /tmp/mysql.sock

[mysqld]
port = 3306
socket = ~BEARSAMPP_LIN_PATH~/tmp/mysql.sock
key_buffer_size = 16M
max_allowed_packet = 1M

sort_buffer_size = 512K
net_buffer_length = 8K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
basedir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.0.33
log-error=~BEARSAMPP_LIN_PATH~/logs/mysql.log
datadir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.0.33/data

skip-federated

server-id = 1

innodb_buffer_pool_size = 16M
innodb_log_file_size = 5M
innodb_log_buffer_size = 8M
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50

sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO
default_authentication_plugin=mysql_native_password
character-set-server=UTF8MB4

[mysqldump]
quick
max_allowed_packet = 16M

[mysql]
no-auto-rehash
#safe-updates

[isamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[myisamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[mysqlhotcopy]
interactive-timeout
55 changes: 55 additions & 0 deletions bin/mysql8.0.33/my.ini.ber
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[client]
port = 3306
socket = /tmp/mysql.sock

[mysqld]
port = 3306
socket = ~BEARSAMPP_LIN_PATH~/tmp/mysql.sock
key_buffer_size = 16M
max_allowed_packet = 1M

sort_buffer_size = 512K
net_buffer_length = 8K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
basedir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.0.33
log-error=~BEARSAMPP_LIN_PATH~/logs/mysql.log
datadir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.0.33/data

skip-federated

server-id = 1

innodb_buffer_pool_size = 16M
innodb_log_file_size = 5M
innodb_log_buffer_size = 8M
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50

sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO
default_authentication_plugin=mysql_native_password
character-set-server=UTF8MB4

[mysqldump]
quick
max_allowed_packet = 16M

[mysql]
no-auto-rehash
#safe-updates

[isamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[myisamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[mysqlhotcopy]
interactive-timeout
10 changes: 10 additions & 0 deletions bin/mysql8.0.36/bearsampp.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
mysqlVersion = "8.0.36"
mysqlExe = "bin/mysqld.exe"
mysqlCliExe = "bin/mysql.exe"
mysqlAdmin = "bin/mysqladmin.exe"
mysqlConf = "my.ini"
mysqlPort = "3306"
mysqlRootUser = "root"
mysqlRootPwd = ""

bundleRelease = "@RELEASE_VERSION@"
3 changes: 3 additions & 0 deletions bin/mysql8.0.36/init.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@ECHO OFF

%~dp0bin\mysqld.exe --initialize-insecure
55 changes: 55 additions & 0 deletions bin/mysql8.0.36/my.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[client]
port = 3306
socket = /tmp/mysql.sock

[mysqld]
port = 3306
socket = ~BEARSAMPP_LIN_PATH~/tmp/mysql.sock
key_buffer_size = 16M
max_allowed_packet = 1M

sort_buffer_size = 512K
net_buffer_length = 8K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
basedir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.0.36
log-error=~BEARSAMPP_LIN_PATH~/logs/mysql.log
datadir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.0.36/data

skip-federated

server-id = 1

innodb_buffer_pool_size = 16M
innodb_log_file_size = 5M
innodb_log_buffer_size = 8M
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50

sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO
default_authentication_plugin=mysql_native_password
character-set-server=UTF8MB4

[mysqldump]
quick
max_allowed_packet = 16M

[mysql]
no-auto-rehash
#safe-updates

[isamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[myisamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[mysqlhotcopy]
interactive-timeout
55 changes: 55 additions & 0 deletions bin/mysql8.0.36/my.ini.ber
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[client]
port = 3306
socket = /tmp/mysql.sock

[mysqld]
port = 3306
socket = ~BEARSAMPP_LIN_PATH~/tmp/mysql.sock
key_buffer_size = 16M
max_allowed_packet = 1M

sort_buffer_size = 512K
net_buffer_length = 8K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
basedir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.0.36
log-error=~BEARSAMPP_LIN_PATH~/logs/mysql.log
datadir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.0.36/data

skip-federated

server-id = 1

innodb_buffer_pool_size = 16M
innodb_log_file_size = 5M
innodb_log_buffer_size = 8M
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50

sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO
default_authentication_plugin=mysql_native_password
character-set-server=UTF8MB4

[mysqldump]
quick
max_allowed_packet = 16M

[mysql]
no-auto-rehash
#safe-updates

[isamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[myisamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[mysqlhotcopy]
interactive-timeout
10 changes: 10 additions & 0 deletions bin/mysql8.3.0/bearsampp.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
mysqlVersion = "8.3.0"
mysqlExe = "bin/mysqld.exe"
mysqlCliExe = "bin/mysql.exe"
mysqlAdmin = "bin/mysqladmin.exe"
mysqlConf = "my.ini"
mysqlPort = "3306"
mysqlRootUser = "root"
mysqlRootPwd = ""

bundleRelease = "@RELEASE_VERSION@"
3 changes: 3 additions & 0 deletions bin/mysql8.3.0/init.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@ECHO OFF

%~dp0bin\mysqld.exe --initialize-insecure
55 changes: 55 additions & 0 deletions bin/mysql8.3.0/my.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[client]
port = 3306
socket = /tmp/mysql.sock

[mysqld]
port = 3306
socket = ~BEARSAMPP_LIN_PATH~/tmp/mysql.sock
key_buffer_size = 16M
max_allowed_packet = 1M

sort_buffer_size = 512K
net_buffer_length = 8K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
basedir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.3.0
log-error=~BEARSAMPP_LIN_PATH~/logs/mysql.log
datadir=~BEARSAMPP_LIN_PATH~/bin/mysql/mysql8.3.0/data

skip-federated

server-id = 1

innodb_buffer_pool_size = 16M
innodb_log_file_size = 5M
innodb_log_buffer_size = 8M
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50

sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO
default_authentication_plugin=mysql_native_password
character-set-server=UTF8MB4

[mysqldump]
quick
max_allowed_packet = 16M

[mysql]
no-auto-rehash
#safe-updates

[isamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[myisamchk]
key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M

[mysqlhotcopy]
interactive-timeout
Loading

0 comments on commit e0ca734

Please sign in to comment.