mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
208b677637
When mysqldadmin is run with sleep and count options, it goes into an infinite loop and keeps executing the specified command. This happened because the statement, responsible for decrementing the count value, was missing. Fixed by adding a statement which will decrement the count value for each iteration. client/mysqladmin.cc: Bug#58221 : mysqladmin --sleep=x --count=x keeps looping Added a condition to check and decrement the count value stored in nr_iterations per iteration. mysql-test/r/mysqladmin.result: Added a testcase for Bug#58221. mysql-test/t/mysqladmin.test: Added a testcase for Bug#58221.
47 lines
1.5 KiB
Text
47 lines
1.5 KiB
Text
# Embedded server doesn't support external clients
|
|
--source include/not_embedded.inc
|
|
#
|
|
# Test "mysqladmin ping"
|
|
#
|
|
|
|
--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1
|
|
|
|
|
|
#
|
|
# Bug#10608 mysqladmin breaks on "database" variable in my.cnf
|
|
#
|
|
|
|
# When mysqladmin finds database in .cnf file it shall fail
|
|
--write_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf
|
|
[client]
|
|
database=db1
|
|
EOF
|
|
|
|
--replace_regex /.*mysqladmin.*: unknown/mysqladmin: unknown/
|
|
--error 7
|
|
--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1
|
|
remove_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf;
|
|
|
|
# When mysqladmin finds "loose-database" in .cnf file it shall print
|
|
# a warning and continue
|
|
--write_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf
|
|
[client]
|
|
loose-database=db2
|
|
EOF
|
|
|
|
--replace_regex /Warning: .*mysqladmin.*: unknown/Warning: mysqladmin: unknown/
|
|
--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1
|
|
|
|
remove_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf;
|
|
|
|
--echo #
|
|
--echo # Bug#58221 : mysqladmin --sleep=x --count=x keeps looping
|
|
--echo #
|
|
|
|
--echo # Executing mysqladmin with --sleep=1 and --count=2.
|
|
--exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --sleep=1 --count=2 ping > $MYSQLTEST_VARDIR/tmp/mysqladmin.tmp
|
|
--echo # Done.
|
|
--echo # Displaying the output :
|
|
--cat_file $MYSQLTEST_VARDIR/tmp/mysqladmin.tmp
|
|
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/mysqladmin.tmp
|