List:Commits« Previous MessageNext Message »
From:Nirbhay Choubey Date:March 17 2011 12:31pm
Subject:bzr commit into mysql-5.5 branch (nirbhay.choubey:3377) Bug#11766184
View as plain text  
#At file:///home/nirbhay/Project/mysql/repo/bugs/source/mysql-5.5.59234/ based on revid:nirbhay.choubey@stripped

 3377 Nirbhay Choubey	2011-03-17
      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.

    modified:
      mysql-test/r/mysqladmin.result
      mysql-test/t/mysqladmin.test
=== modified file 'mysql-test/r/mysqladmin.result'
--- a/mysql-test/r/mysqladmin.result	2011-01-15 20:34:08 +0000
+++ b/mysql-test/r/mysqladmin.result	2011-03-17 12:31:06 +0000
@@ -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

=== modified file 'mysql-test/t/mysqladmin.test'
--- a/mysql-test/t/mysqladmin.test	2011-01-15 20:38:24 +0000
+++ b/mysql-test/t/mysqladmin.test	2011-03-17 12:31:06 +0000
@@ -45,3 +45,17 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug106
 --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


Attachment: [text/bzr-bundle]
Thread
bzr commit into mysql-5.5 branch (nirbhay.choubey:3377) Bug#11766184Nirbhay Choubey17 Mar