expire-logs-days=0 on install and temp_server_start
This prevents the warning "You need to use --log-bin to make --expire-logs-days or --binlog-expire-logs-seconds work" in 10.6+. Cause, is that expire_logs_days is set in the default configuration (https://github.com/MariaDB/server/blob/10.5/debian/additions/mariadb.conf.d/50-server.cnf). Closes: #425
This commit is contained in:
parent
db55d2702d
commit
bf522faed0
@ -121,6 +121,7 @@ mysql_get_config() {
|
|||||||
# Do a temporary startup of the MariaDB server, for init purposes
|
# Do a temporary startup of the MariaDB server, for init purposes
|
||||||
docker_temp_server_start() {
|
docker_temp_server_start() {
|
||||||
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 &
|
--loose-innodb_buffer_pool_load_at_startup=0 &
|
||||||
declare -g MARIADB_PID
|
declare -g MARIADB_PID
|
||||||
MARIADB_PID=$!
|
MARIADB_PID=$!
|
||||||
@ -194,7 +195,9 @@ docker_init_database_dir() {
|
|||||||
fi
|
fi
|
||||||
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
||||||
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
||||||
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
|
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
||||||
|
--skip-log-bin \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 \
|
--loose-innodb_buffer_pool_load_at_startup=0 \
|
||||||
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
||||||
mysql_note "Database files initialized"
|
mysql_note "Database files initialized"
|
||||||
|
@ -121,6 +121,7 @@ mysql_get_config() {
|
|||||||
# Do a temporary startup of the MariaDB server, for init purposes
|
# Do a temporary startup of the MariaDB server, for init purposes
|
||||||
docker_temp_server_start() {
|
docker_temp_server_start() {
|
||||||
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 &
|
--loose-innodb_buffer_pool_load_at_startup=0 &
|
||||||
declare -g MARIADB_PID
|
declare -g MARIADB_PID
|
||||||
MARIADB_PID=$!
|
MARIADB_PID=$!
|
||||||
@ -194,7 +195,9 @@ docker_init_database_dir() {
|
|||||||
fi
|
fi
|
||||||
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
||||||
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
||||||
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
|
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
||||||
|
--skip-log-bin \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 \
|
--loose-innodb_buffer_pool_load_at_startup=0 \
|
||||||
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
||||||
mysql_note "Database files initialized"
|
mysql_note "Database files initialized"
|
||||||
|
@ -121,6 +121,7 @@ mysql_get_config() {
|
|||||||
# Do a temporary startup of the MariaDB server, for init purposes
|
# Do a temporary startup of the MariaDB server, for init purposes
|
||||||
docker_temp_server_start() {
|
docker_temp_server_start() {
|
||||||
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 &
|
--loose-innodb_buffer_pool_load_at_startup=0 &
|
||||||
declare -g MARIADB_PID
|
declare -g MARIADB_PID
|
||||||
MARIADB_PID=$!
|
MARIADB_PID=$!
|
||||||
@ -194,7 +195,9 @@ docker_init_database_dir() {
|
|||||||
fi
|
fi
|
||||||
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
||||||
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
||||||
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
|
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
||||||
|
--skip-log-bin \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 \
|
--loose-innodb_buffer_pool_load_at_startup=0 \
|
||||||
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
||||||
mysql_note "Database files initialized"
|
mysql_note "Database files initialized"
|
||||||
|
@ -121,6 +121,7 @@ mysql_get_config() {
|
|||||||
# Do a temporary startup of the MariaDB server, for init purposes
|
# Do a temporary startup of the MariaDB server, for init purposes
|
||||||
docker_temp_server_start() {
|
docker_temp_server_start() {
|
||||||
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 &
|
--loose-innodb_buffer_pool_load_at_startup=0 &
|
||||||
declare -g MARIADB_PID
|
declare -g MARIADB_PID
|
||||||
MARIADB_PID=$!
|
MARIADB_PID=$!
|
||||||
@ -194,7 +195,9 @@ docker_init_database_dir() {
|
|||||||
fi
|
fi
|
||||||
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
||||||
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
||||||
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
|
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
||||||
|
--skip-log-bin \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 \
|
--loose-innodb_buffer_pool_load_at_startup=0 \
|
||||||
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
||||||
mysql_note "Database files initialized"
|
mysql_note "Database files initialized"
|
||||||
|
@ -121,6 +121,7 @@ mysql_get_config() {
|
|||||||
# Do a temporary startup of the MariaDB server, for init purposes
|
# Do a temporary startup of the MariaDB server, for init purposes
|
||||||
docker_temp_server_start() {
|
docker_temp_server_start() {
|
||||||
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 &
|
--loose-innodb_buffer_pool_load_at_startup=0 &
|
||||||
declare -g MARIADB_PID
|
declare -g MARIADB_PID
|
||||||
MARIADB_PID=$!
|
MARIADB_PID=$!
|
||||||
@ -194,7 +195,9 @@ docker_init_database_dir() {
|
|||||||
fi
|
fi
|
||||||
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
|
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
|
||||||
mariadb-install-db "${installArgs[@]}" "${@:2}" \
|
mariadb-install-db "${installArgs[@]}" "${@:2}" \
|
||||||
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
|
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
||||||
|
--skip-log-bin \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 \
|
--loose-innodb_buffer_pool_load_at_startup=0 \
|
||||||
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
||||||
mysql_note "Database files initialized"
|
mysql_note "Database files initialized"
|
||||||
|
@ -121,6 +121,7 @@ mysql_get_config() {
|
|||||||
# Do a temporary startup of the MariaDB server, for init purposes
|
# Do a temporary startup of the MariaDB server, for init purposes
|
||||||
docker_temp_server_start() {
|
docker_temp_server_start() {
|
||||||
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 &
|
--loose-innodb_buffer_pool_load_at_startup=0 &
|
||||||
declare -g MARIADB_PID
|
declare -g MARIADB_PID
|
||||||
MARIADB_PID=$!
|
MARIADB_PID=$!
|
||||||
@ -194,7 +195,9 @@ docker_init_database_dir() {
|
|||||||
fi
|
fi
|
||||||
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
|
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
|
||||||
mariadb-install-db "${installArgs[@]}" "${@:2}" \
|
mariadb-install-db "${installArgs[@]}" "${@:2}" \
|
||||||
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
|
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
||||||
|
--skip-log-bin \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 \
|
--loose-innodb_buffer_pool_load_at_startup=0 \
|
||||||
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
||||||
mysql_note "Database files initialized"
|
mysql_note "Database files initialized"
|
||||||
|
@ -121,6 +121,7 @@ mysql_get_config() {
|
|||||||
# Do a temporary startup of the MariaDB server, for init purposes
|
# Do a temporary startup of the MariaDB server, for init purposes
|
||||||
docker_temp_server_start() {
|
docker_temp_server_start() {
|
||||||
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 &
|
--loose-innodb_buffer_pool_load_at_startup=0 &
|
||||||
declare -g MARIADB_PID
|
declare -g MARIADB_PID
|
||||||
MARIADB_PID=$!
|
MARIADB_PID=$!
|
||||||
@ -194,7 +195,9 @@ docker_init_database_dir() {
|
|||||||
fi
|
fi
|
||||||
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
|
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
|
||||||
mariadb-install-db "${installArgs[@]}" "${@:2}" \
|
mariadb-install-db "${installArgs[@]}" "${@:2}" \
|
||||||
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
|
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
||||||
|
--skip-log-bin \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 \
|
--loose-innodb_buffer_pool_load_at_startup=0 \
|
||||||
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
||||||
mysql_note "Database files initialized"
|
mysql_note "Database files initialized"
|
||||||
|
@ -121,6 +121,7 @@ mysql_get_config() {
|
|||||||
# Do a temporary startup of the MariaDB server, for init purposes
|
# Do a temporary startup of the MariaDB server, for init purposes
|
||||||
docker_temp_server_start() {
|
docker_temp_server_start() {
|
||||||
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 &
|
--loose-innodb_buffer_pool_load_at_startup=0 &
|
||||||
declare -g MARIADB_PID
|
declare -g MARIADB_PID
|
||||||
MARIADB_PID=$!
|
MARIADB_PID=$!
|
||||||
@ -194,7 +195,9 @@ docker_init_database_dir() {
|
|||||||
fi
|
fi
|
||||||
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
||||||
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
||||||
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
|
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
||||||
|
--skip-log-bin \
|
||||||
|
--expire-logs-days=0 \
|
||||||
--loose-innodb_buffer_pool_load_at_startup=0 \
|
--loose-innodb_buffer_pool_load_at_startup=0 \
|
||||||
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
--loose-innodb_buffer_pool_dump_at_shutdown=0
|
||||||
mysql_note "Database files initialized"
|
mysql_note "Database files initialized"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user