From 6a9dbf0e5892f4cdb7f641bb9058aca92fd2df09 Mon Sep 17 00:00:00 2001
From: david hill <david.hill@mariadb.com>
Date: Sun, 15 May 2016 13:53:07 -0500
Subject: [PATCH] changes

---
 oam/install_scripts/columnstoreAlias   |  2 +-
 oam/install_scripts/post-mysql-install | 10 +++++-----
 oamapps/postConfigure/installer.cpp    |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/oam/install_scripts/columnstoreAlias b/oam/install_scripts/columnstoreAlias
index 5298f7d65..eb92ffa12 100644
--- a/oam/install_scripts/columnstoreAlias
+++ b/oam/install_scripts/columnstoreAlias
@@ -1,4 +1,4 @@
-# InfiniDB Alias Commands
+# MariaDB Columnstore Alias Commands
 #
 alias mcsmysql='/usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -u root'
 alias ma=/usr/local/MariaDB/Columnstore/bin/mcsadmin
diff --git a/oam/install_scripts/post-mysql-install b/oam/install_scripts/post-mysql-install
index 5f7f24cc5..2b9be81d3 100755
--- a/oam/install_scripts/post-mysql-install
+++ b/oam/install_scripts/post-mysql-install
@@ -24,24 +24,24 @@ checkForError() {
 	rm -f /tmp/error.check
 
         #---------------------------------------------------------------------------
-        # See if engine columnstore exist
+        # See if engine infinidb exist
         #---------------------------------------------------------------------------
-        echo "checking for engine columnstore..."
+        echo "checking for engine infinidb..."
         $installdir/mysql/bin/mysql \
                 --defaults-file=$installdir/mysql/my.cnf \
                 --user=root $pwprompt \
                 --execute='show engines;' \
-                calpontsys | grep -i columnstore
+                calpontsys | grep -i infinidb
 
         #
         # Add compressiontype column to SYSCOLUMN if applicable
         #
         if [ $? -ne 0 ]; then
-                echo "columnstore doesn't exist"
+                echo "infinidb doesn't exist"
                 return 1
         fi
 
-        echo "columnstore exist"
+        echo "infinidb exist"
 
 	return 0;
 }
diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index 8eff699ab..11062b788 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -680,7 +680,7 @@ int main(int argc, char *argv[])
 		sm.updateSNMPD("parentOAMIPStub", parentOAMModuleIPAddr);
 	}
 
-	string idbstartcmd = installDir + "/bin/infinidb start";
+	string idbstartcmd = installDir + "/bin/columnstore start";
 	if ( IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM || 
 			performancemodulelist.size() > 1 ) {
 		// 
@@ -822,7 +822,7 @@ int main(int argc, char *argv[])
 			//
 
 			//run the mysql / mysqld setup scripts
-			cout << endl << "Running the Infinidb MySQL setup scripts" << endl << endl;
+			cout << endl << "Running the MariaDB Columnstore MySQL setup scripts" << endl << endl;
 	
 			// call the mysql setup scripts
 			mysqlSetup();