diff --git a/oam/install_scripts/post-mysql-install b/oam/install_scripts/post-mysql-install
index 57e950f68..ae5970ffe 100755
--- a/oam/install_scripts/post-mysql-install
+++ b/oam/install_scripts/post-mysql-install
@@ -44,7 +44,6 @@ checkForError() {
 prefix=/usr/local
 installdir=$prefix/mariadb/columnstore
 rpmmode=install
-password=" "
 tmpdir="/tmp"
 
 for arg in "$@"; do
@@ -105,27 +104,6 @@ if [ -x $installdir/mysql/mysql-Columnstore ]; then
 
 	sleep 5
 	
-	# Run MariaDB (mysql) upgrade script, if it exist
-	if [ -x $installdir/mysql/bin/mysql_upgrade ]; then
-		if [[ ${password} == " " ]]; then
-			$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf > $tmpdir/mysql_upgrade.log
-			if [ $? -ne 0 ]; then
-				echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
-				$installdir/mysql/mysql-Columnstore stop
-				sleep 2
-				exit 2;
-			fi
-		else
-			$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf --password=$password  > $tmpdir/mysql_upgrade.log
-			if [ $? -ne 0 ]; then
-				echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
-				$installdir/mysql/mysql-Columnstore stop
-				sleep 2
-				exit 2;
-			fi
-		fi
-	fi
-
 	# Install various Calpont stuff...
 	$installdir/mysql/install_calpont_mysql.sh  --installdir=$installdir --tmpdir=$tmpdir
 	checkForError
diff --git a/oam/install_scripts/post-mysqld-install b/oam/install_scripts/post-mysqld-install
index 3d9ce2b72..939f48006 100755
--- a/oam/install_scripts/post-mysqld-install
+++ b/oam/install_scripts/post-mysqld-install
@@ -77,38 +77,43 @@ fi
 # InfiniDB testing hook...
 test -x /usr/local/bin/idb-testing-mysql-pre-start && /usr/local/bin/idb-testing-mysql-pre-start $installdir/mysql
 
-if [ -x $installdir/mysql/mysql-Columnstore ]; then
-	# Restart in the same way that mysqld will be started normally.
-	$installdir/mysql/mysql-Columnstore stop >/dev/null 2>&1
-	sleep 2
-	$installdir/mysql/mysql-Columnstore start
+# If DB exist, run upgrade script if it exist
+if [ -d $installdir/mysql/db/calpontsys ]; then
 
-	sleep 5
-	
-	# Run MariaDB (mysql) upgrade script, if it exist
-	if [ -x $installdir/mysql/bin/mysql_upgrade ]; then
-		if [[ ${password} == " " ]]; then
-			$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf > $tmpdir/mysql_upgrade.log
-			if [ $? -ne 0 ]; then
-				echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
-				$installdir/mysql/mysql-Columnstore stop
-				sleep 2
-				exit 2;
-			fi
-		else
-			$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf --password=$password  > $tmpdir/mysql_upgrade.log
-			if [ $? -ne 0 ]; then
-				echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
-				$installdir/mysql/mysql-Columnstore stop
-				sleep 2
-				exit 2;
+	if [ -x $installdir/mysql/mysql-Columnstore ]; then
+		# Restart in the same way that mysqld will be started normally.
+		$installdir/mysql/mysql-Columnstore stop >/dev/null 2>&1
+		sleep 2
+		$installdir/mysql/mysql-Columnstore start
+
+		sleep 5
+		
+		# Run MariaDB (mysql) upgrade script, if it exist
+		if [ -x $installdir/mysql/bin/mysql_upgrade ]; then
+			echo "Running mysql_upgrade script"
+			if [[ ${password} == " " ]]; then
+				$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf > $tmpdir/mysql_upgrade.log
+				if [ $? -ne 0 ]; then
+					echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
+					$installdir/mysql/mysql-Columnstore stop
+					sleep 2
+					exit 2;
+				fi
+			else
+				$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf --password=$password  > $tmpdir/mysql_upgrade.log
+				if [ $? -ne 0 ]; then
+					echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
+					$installdir/mysql/mysql-Columnstore stop
+					sleep 2
+					exit 2;
+				fi
 			fi
 		fi
+		
+		# stop
+		$installdir/mysql/mysql-Columnstore stop
+		sleep 2
 	fi
-	
-	# stop
-	$installdir/mysql/mysql-Columnstore stop >/dev/null 2>&1
-	sleep 2
 fi
 
 ### Don't give the user the notes, we'll fix them ourselves...