diff options
| author | Nirbhay Choubey <nirbhay.choubey@sun.com> | 2011-03-17 18:01:06 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@sun.com> | 2011-03-17 18:01:06 +0530 |
| commit | d82d0f52c62e3d52ad2d94a09b85590a22f1ef7e (patch) | |
| tree | 218ddebe1ef956f7ddd7126082a35dfbd942c90c | |
| parent | 0216713de6e72b9436569924634504db4e9bef76 (diff) | |
| download | mariadb-git-d82d0f52c62e3d52ad2d94a09b85590a22f1ef7e.tar.gz | |
BUG#11766184 - 59234 : cmdline clients crash --defaults-extra-file
with no .cnf or .ini extension.
Fix for this bug was pushed as part of Bug#11765482.
mysql-test/r/mysqladmin.result:
Added test case for Bug#11766184.
mysql-test/t/mysqladmin.test:
Added test case for Bug#11766184.
| -rw-r--r-- | mysql-test/r/mysqladmin.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/mysqladmin.test | 14 |
2 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/mysqladmin.result b/mysql-test/r/mysqladmin.result index 748152bffcc..8a9b009946b 100644 --- a/mysql-test/r/mysqladmin.result +++ b/mysql-test/r/mysqladmin.result @@ -10,3 +10,10 @@ mysqld is alive # Displaying the output : mysqld is alive mysqld is alive +# +# BUG#11766184 - 59234: cmdline clients crash --defaults-extra-file +# with no .cnf or .ini extension. +# +# Creating an empty file 'cnf_file' +# Using --defaults-extra-file option with 'cnf_file'. +mysqld is alive diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test index c3bfc585289..4811c5fdbc6 100644 --- a/mysql-test/t/mysqladmin.test +++ b/mysql-test/t/mysqladmin.test @@ -45,3 +45,17 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf; --cat_file $MYSQLTEST_VARDIR/tmp/mysqladmin.tmp --remove_file $MYSQLTEST_VARDIR/tmp/mysqladmin.tmp + +--echo # +--echo # BUG#11766184 - 59234: cmdline clients crash --defaults-extra-file +--echo # with no .cnf or .ini extension. +--echo # + +--echo # Creating an empty file 'cnf_file' +--write_file $MYSQLTEST_VARDIR/tmp/cnf_file +EOF + +--echo # Using --defaults-extra-file option with 'cnf_file'. +--exec $MYSQLADMIN --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/cnf_file -uroot -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1 + +--remove_file $MYSQLTEST_VARDIR/tmp/cnf_file |