From bcb98fcec90c3d7a7caaabed737699cf05933c70 Mon Sep 17 00:00:00 2001
From: lissav <lissav@us.ibm.com>
Date: Wed, 15 Jan 2014 06:14:52 -0500
Subject: [PATCH]  fix mysqlsetup -u

---
 xCAT-client/bin/mysqlsetup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup
index 0a150224e..dd0711aac 100755
--- a/xCAT-client/bin/mysqlsetup
+++ b/xCAT-client/bin/mysqlsetup
@@ -205,10 +205,10 @@ if ($::osname eq 'AIX')
     &setulimits;
 }
 
-#  if not just odbc update  and not already running mysql
+#  if not just odbc update  and not already running mysql or mysqlsetup -u
 #  Get root and admin passwords
 #
-if (($odbconly == 0) && ( $::xcatrunningmysql == 0))
+if ((($odbconly == 0) && ( $::xcatrunningmysql == 0)) || $::UPDATE )
 {    # not just updating the odbc
     if ($ENV{'XCATMYSQLADMIN_PW'})    # input env sets the password
     {