Merge branch 'main' into feat/add-support-ubuntu-24-04

Author: tomkrouper

test/cookbooks/test/recipes/smoke.rb

@@ -91,7 +91,8 @@
   code <<-EOF
   MYSQL_PWD=#{Shellwords.escape(root_pass_master)} /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -D mysql -e "CREATE USER 'repl'@'127.0.0.1' IDENTIFIED BY 'REPLICAAATE';"
   MYSQL_PWD=#{Shellwords.escape(root_pass_master)} /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -D mysql -e "GRANT REPLICATION SLAVE ON *.* TO 'repl'@'127.0.0.1';"
-  /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -p#{Shellwords.escape(root_pass_master)} -e 'show grants'
+  /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -pilikerandompasswords -e 'show grants' # testing default password
+  /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -e 'show grants' # testing no password
   EOF
   not_if "/usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -p#{Shellwords.escape(root_pass_master)} -e 'select User,Host from mysql.user' | grep repl"
   action :run