MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jim Winstead Date:May 7 2009 5:53pm
Subject:bzr commit into mysql-5.1-bugteam branch (jimw:2888) Bug#28479
View as plain text  
#At file:///Users/jimw/my/mysql-5.1/ based on revid:jimw@stripped

 2888 Jim Winstead	2009-05-07
      Various command-line utilities, including mysqlbinlog and mysqldump, don't
      handle the --skip-password option correctly. (Bug #28479)
      modified:
        client/mysql_upgrade.c
        client/mysqladmin.cc
        client/mysqlbinlog.cc
        client/mysqlcheck.c
        client/mysqldump.c
        client/mysqlimport.c
        client/mysqlshow.c
        client/mysqlslap.c
        client/mysqltest.cc

=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c	2009-04-28 18:26:31 +0000
+++ b/client/mysql_upgrade.c	2009-05-07 17:51:55 +0000
@@ -231,6 +231,8 @@ get_one_option(int optid, const struct m
     break;
 
   case 'p':
+    if (argument == disabled_my_option)
+      argument= (char*) "";			// Don't require password
     tty_password= 1;
     add_option= FALSE;
     if (argument)

=== modified file 'client/mysqladmin.cc'
--- a/client/mysqladmin.cc	2009-02-13 16:41:47 +0000
+++ b/client/mysqladmin.cc	2009-05-07 17:51:55 +0000
@@ -232,6 +232,8 @@ get_one_option(int optid, const struct m
     opt_count_iterations= 1;
     break;
   case 'p':
+    if (argument == disabled_my_option)
+      argument= (char*) "";			// Don't require password
     if (argument)
     {
       char *start=argument;

=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2009-02-13 16:41:47 +0000
+++ b/client/mysqlbinlog.cc	2009-05-07 17:51:55 +0000
@@ -1226,6 +1226,8 @@ get_one_option(int optid, const struct m
     one_database = 1;
     break;
   case 'p':
+    if (argument == disabled_my_option)
+      argument= (char*) "";                     // Don't require password
     if (argument)
     {
       my_free(pass,MYF(MY_ALLOW_ZERO_PTR));

=== modified file 'client/mysqlcheck.c'
--- a/client/mysqlcheck.c	2009-02-13 16:41:47 +0000
+++ b/client/mysqlcheck.c	2009-05-07 17:51:55 +0000
@@ -286,6 +286,8 @@ get_one_option(int optid, const struct m
     what_to_do= DO_UPGRADE;
     break;
   case 'p':
+    if (argument == disabled_my_option)
+      argument= (char*) "";			// Don't require password
     if (argument)
     {
       char *start = argument;

=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2009-04-28 18:23:21 +0000
+++ b/client/mysqldump.c	2009-05-07 17:51:55 +0000
@@ -702,6 +702,8 @@ get_one_option(int optid, const struct m
     break;
 #endif
   case 'p':
+    if (argument == disabled_my_option)
+      argument= (char*) "";                     // Don't require password
     if (argument)
     {
       char *start=argument;

=== modified file 'client/mysqlimport.c'
--- a/client/mysqlimport.c	2008-11-14 16:29:38 +0000
+++ b/client/mysqlimport.c	2009-05-07 17:51:55 +0000
@@ -221,6 +221,8 @@ get_one_option(int optid, const struct m
     break;
 #endif
   case 'p':
+    if (argument == disabled_my_option)
+      argument= (char*) "";			// Don't require password
     if (argument)
     {
       char *start=argument;

=== modified file 'client/mysqlshow.c'
--- a/client/mysqlshow.c	2008-11-14 16:29:38 +0000
+++ b/client/mysqlshow.c	2009-05-07 17:51:55 +0000
@@ -281,6 +281,8 @@ get_one_option(int optid, const struct m
     opt_verbose++;
     break;
   case 'p':
+    if (argument == disabled_my_option)
+      argument= (char*) "";			// Don't require password
     if (argument)
     {
       char *start=argument;

=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c	2009-02-13 16:41:47 +0000
+++ b/client/mysqlslap.c	2009-05-07 17:51:55 +0000
@@ -712,6 +712,8 @@ get_one_option(int optid, const struct m
     verbose++;
     break;
   case 'p':
+    if (argument == disabled_my_option)
+      argument= (char*) "";			// Don't require password
     if (argument)
     {
       char *start= argument;

=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2009-04-28 18:26:31 +0000
+++ b/client/mysqltest.cc	2009-05-07 17:51:55 +0000
@@ -5803,6 +5803,8 @@ get_one_option(int optid, const struct m
     break;
   }
   case 'p':
+    if (argument == disabled_my_option)
+      argument= (char*) "";			// Don't require password
     if (argument)
     {
       my_free(opt_pass, MYF(MY_ALLOW_ZERO_PTR));

Thread
bzr commit into mysql-5.1-bugteam branch (jimw:2888) Bug#28479Jim Winstead7 May