Merge pull request #1847 from DaveBirdsall/Trafodion3315

[TRAFODION-3315] Add Hive exception info to OSIM Hive error message
diff --git a/core/sql/optimizer/OptimizerSimulator.cpp b/core/sql/optimizer/OptimizerSimulator.cpp
index 5aaa4f6..c862dde 100644
--- a/core/sql/optimizer/OptimizerSimulator.cpp
+++ b/core/sql/optimizer/OptimizerSimulator.cpp
@@ -1554,7 +1554,13 @@
 void OptimizerSimulator::execHiveSQL(const char* hiveSQL)
 {
     if (HiveClient_JNI::executeHiveSQL(hiveSQL) != HVC_OK)
-      raiseOsimException("Error running hive SQL.");
+    {
+        NAString error("Error running hive SQL. ");
+        const char * jniErrorStr = GetCliGlobals()->getJniErrorStr();
+        if (jniErrorStr)
+          error += jniErrorStr;
+        raiseOsimException(error.data());
+    }
 }
 
 short OptimizerSimulator::loadHistogramsTable(NAString* modifiedPath, QualifiedName * qualifiedName, unsigned int bufLen, NABoolean isHive)