Skip to content

Commit 7a0fa9d

Browse files
ottokgrooverdan
authored andcommitted
Deb: Cleanup and document
- Remove unnecessary unused files - Remove duplicate encryption configuration sample from sources and re-use the identical file in RPM directory instead - Clean away harmful "default-character-set = utf8mb4" from client config as it is unnecassary (server enforces utf8mb4 anyway by default) and could cause issues with mysqlbinlog and other tools (MDEV-22981). - Update S3 plugin description to be long enough - Remove trailing whitespace from support-files and Debian packaging. - Clean away fixed Lintian issues - Clean away temporary Salsa-CI fixes now that 10.5.4 is out and is fixed - Apply wrap-and-sort -a -v
1 parent 7c1807a commit 7a0fa9d

File tree

12 files changed

+112
-165
lines changed

12 files changed

+112
-165
lines changed

debian/additions/Docs__Images__Makefile.in

Lines changed: 0 additions & 6 deletions
This file was deleted.

debian/additions/Docs__Makefile.in

Lines changed: 0 additions & 6 deletions
This file was deleted.

debian/additions/debian-start.inc.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
## Check MyISAM and Aria unclosed tables.
77
# - Requires the server to be up.
8-
# - Is supposed to run silently in background.
8+
# - Is supposed to run silently in background.
99
function check_for_crashed_tables() {
1010
set -e
1111
set -u
@@ -25,7 +25,7 @@ function check_for_crashed_tables() {
2525

2626
LC_ALL=C $MYSQL --skip-column-names --batch -e '
2727
select concat('\''select count(*) into @discard from `'\'',
28-
TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'')
28+
TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'')
2929
from information_schema.TABLES where TABLE_SCHEMA<>'\''INFORMATION_SCHEMA'\'' and TABLE_SCHEMA<>'\''PERFORMANCE_SCHEMA'\'' and ( ENGINE='\''MyISAM'\'' or ENGINE='\''Aria'\'' )' | \
3030
xargs -i $MYSQL --skip-column-names --silent --batch \
3131
--force -e "{}" &>$tempfile
@@ -39,8 +39,8 @@ function check_for_crashed_tables() {
3939
$MYADMIN processlist status
4040
) >> $tempfile
4141
# Check for presence as a dependency on mailx would require an MTA.
42-
if [ -x /usr/bin/mailx ]; then
43-
mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < $tempfile
42+
if [ -x /usr/bin/mailx ]; then
43+
mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < $tempfile
4444
fi
4545
(echo "$MYCHECK_SUBJECT"; cat $tempfile) | logger -p daemon.warn -i -t$0
4646
fi
@@ -49,7 +49,7 @@ function check_for_crashed_tables() {
4949

5050
## Check for tables needing an upgrade.
5151
# - Requires the server to be up.
52-
# - Is supposed to run silently in background.
52+
# - Is supposed to run silently in background.
5353
function upgrade_system_tables_if_necessary() {
5454
set -e
5555
set -u
@@ -69,7 +69,7 @@ function upgrade_system_tables_if_necessary() {
6969
function check_root_accounts() {
7070
set -e
7171
set -u
72-
72+
7373
logger -p daemon.info -i -t$0 "Checking for insecure root accounts."
7474

7575
ret=$( echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='' and plugin in ('', 'mysql_native_password', 'mysql_old_password');" | $MYSQL --skip-column-names )

debian/additions/enable_encryption.preset

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)