From 8b18932ebc947b2d33d176fbbb8ac4fe56889406 Mon Sep 17 00:00:00 2001 From: musvaage Date: Fri, 16 Dec 2022 17:01:52 -0600 Subject: debian typos --- debian/additions/innotop/innotop | 2 +- debian/additions/mariadb-report | 4 ++-- debian/mariadb-server-10.5.postinst | 2 +- debian/salsa-ci.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index 23f04fe017c..37d94c87b3c 100644 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -4932,7 +4932,7 @@ sub noecho_password { }; if ( $EVAL_ERROR ) { - die "Cannot read respose; is Term::ReadKey installed? $EVAL_ERROR"; + die "Cannot read response; is Term::ReadKey installed? $EVAL_ERROR"; } return $response; } diff --git a/debian/additions/mariadb-report b/debian/additions/mariadb-report index 665add394ca..979e7502965 100755 --- a/debian/additions/mariadb-report +++ b/debian/additions/mariadb-report @@ -736,7 +736,7 @@ sub set_myisam_vals { print "set_myisam_vals\n" if $op{debug}; -# should be moved elsewere +# should be moved elsewhere $questions = $stats{'Questions'}; $key_read_ratio = sprintf "%.2f", @@ -1397,7 +1397,7 @@ format QCACHE = __ Query Cache _________________________________________________________ Memory usage @>>>>>> of @>>>>>> %Usage: @>>>>> make_short($qc_mem_used, 1), make_short($vars{'query_cache_size'}, 1), perc($qc_mem_used, $vars{'query_cache_size'}) -Block Fragmnt @>>>>>% +Block Fragment @>>>>>% perc($stats{'Qcache_free_blocks'}, $stats{'Qcache_total_blocks'}) Hits @>>>>>> @>>>>>/s make_short($stats{'Qcache_hits'}), t($stats{'Qcache_hits'}) diff --git a/debian/mariadb-server-10.5.postinst b/debian/mariadb-server-10.5.postinst index 20604fd6a81..d6017f32169 100644 --- a/debian/mariadb-server-10.5.postinst +++ b/debian/mariadb-server-10.5.postinst @@ -155,7 +155,7 @@ EOF # This is important to avoid dataloss when there is a removed # mysql-server version from Woody lying around which used the same - # data directory and then somewhen gets purged by the admin. + # data directory and then somehow gets purged by the admin. db_set mariadb-server/postrm_remove_database false || true # Clean up old flags before setting new one diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index c44713d59e4..96708973fa5 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -335,7 +335,7 @@ build mariadbclient consumer Python-MySQLdb: image: debian:${RELEASE} script: - *test-prepare-container - # Run each step separately to avoitda 800+ lines chunk that lacks the + # Run each step separately to avoid an 800+ line chunk that lacks the # commands themselves printed and Gitlab-CI cutting off the output - apt-get install -y pkg-config ./libmariadb-dev*.deb ./libmariadb3_*.deb ./mariadb-common*.deb - pkg-config --cflags --libs mysqlclient # See what MySQLdb builds with -- cgit v1.2.1 From c4938eafc594d6d64e5a17be13c337ada0beb63d Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 16 Dec 2022 15:51:38 +0000 Subject: MDEV-30275: mariadb names rather than mysql names should be used * mariadb-service-convert to use mariadbd-safe * galera_recovery to use mariadbd * mtr - wsrep use mariadb executables * debian/mariadb-server.mariadb.init use mariadbd-safe * debian/tests/smoke uses mariadb instead of mysql as client. Co-Author: Daniel Black --- debian/mariadb-server-10.5.mariadb.init | 8 +++++++- debian/tests/smoke | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/mariadb-server-10.5.mariadb.init b/debian/mariadb-server-10.5.mariadb.init index d2c5c64165a..ca0ee9762db 100644 --- a/debian/mariadb-server-10.5.mariadb.init +++ b/debian/mariadb-server-10.5.mariadb.init @@ -25,6 +25,12 @@ SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" +if [ ! -x /usr/bin/mariadbd-safe ] +then + log_failure_msg "/usr/bin/mariadbd-safe not found or executable! This SysV init script depends on it." + exit -1 +fi + # priority can be overridden and "-s" adds output to stderr ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mariadb -i" @@ -118,7 +124,7 @@ case "${1:-''}" in test -e /run/mysqld || install -m 755 -o mysql -g root -d /run/mysqld # Start MariaDB! - /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER & + /usr/bin/mariadbd-safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER & for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do sleep 1 diff --git a/debian/tests/smoke b/debian/tests/smoke index 4e06feae20c..59185ede314 100644 --- a/debian/tests/smoke +++ b/debian/tests/smoke @@ -40,28 +40,28 @@ else echo "Found systemctl, continuing smoke test.." fi -mysql <&2 exit 1 fi -mysql --user=testuser --password=testpassword testdatabase <