Merge branch 'develop' into MCOL-4841

# Conflicts:
#	exemgr/main.cpp
#	oam/etc/Columnstore.xml.singleserver
#	primitives/primproc/primproc.cpp

utils/windowfunction/framebound.cpp

@@ -72,4 +72,3 @@ const string FrameBound::toString() const
 }
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/framebound.h

@@ -145,4 +145,3 @@ extern std::map<int, std::string> colType2String;
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/frameboundrange.cpp

@@ -411,4 +411,3 @@ template class FrameBoundExpressionRange<float>;
 template class FrameBoundExpressionRange<uint64_t>;
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/frameboundrange.h

@@ -213,4 +213,3 @@ class FrameBoundExpressionRange : public FrameBoundConstantRange<T>
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/frameboundrow.cpp

@@ -139,4 +139,3 @@ template class FrameBoundExpressionRow<float>;
 template class FrameBoundExpressionRow<uint64_t>;
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/frameboundrow.h

@@ -146,4 +146,3 @@ class FrameBoundExpressionRow : public FrameBoundConstantRow
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/idborderby.cpp

@@ -898,4 +898,3 @@ bool IdbOrderBy::Eq::operator()(const Row::Pointer& d1, const Row::Pointer& d2)
 }
 
 }  // namespace ordering
-// vim:ts=4 sw=4:

utils/windowfunction/wf_count.cpp

@@ -184,4 +184,3 @@ template boost::shared_ptr<WindowFunctionType> WF_count<int64_t>::makeFunction(i
                                                                                WindowFunctionColumn*);
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_count.h

@@ -47,4 +47,3 @@ class WF_count : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_lead_lag.cpp

@@ -306,4 +306,3 @@ template void WF_lead_lag<double>::parseParms(const std::vector<execplan::SRCP>&
 template void WF_lead_lag<string>::parseParms(const std::vector<execplan::SRCP>&);
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_lead_lag.h

@@ -52,4 +52,3 @@ class WF_lead_lag : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_min_max.cpp

@@ -185,4 +185,3 @@ template boost::shared_ptr<WindowFunctionType> WF_min_max<int64_t>::makeFunction
                                                                                  WindowFunctionColumn*);
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_min_max.h

@@ -46,4 +46,3 @@ class WF_min_max : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_nth_value.cpp

@@ -271,4 +271,3 @@ template boost::shared_ptr<WindowFunctionType> WF_nth_value<int64_t>::makeFuncti
                                                                                    WindowFunctionColumn*);
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_nth_value.h

@@ -50,4 +50,3 @@ class WF_nth_value : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_ntile.cpp

@@ -154,4 +154,3 @@ void WF_ntile::operator()(int64_t b, int64_t e, int64_t c)
 }
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_ntile.h

@@ -47,4 +47,3 @@ class WF_ntile : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_percentile.cpp

@@ -335,7 +335,10 @@ void WF_percentile<T>::operator()(int64_t b, int64_t e, int64_t c)
         vd = (crn - rn) * fv + (rn - frn) * cv;
       }
 
-      v = *(reinterpret_cast<T*>(&vd));
+      double tempvd[2];
+      tempvd[0] = vd;
+      tempvd[1] = 0;
+      v = *(reinterpret_cast<T*>(&tempvd[0])); // old code that referred to 'vd' var triggered partial out-of-bounds warning.
       p = &v;
     }
     else  // (fFunctionId == WF__PERCENTILE_DISC)
@@ -382,4 +385,3 @@ template boost::shared_ptr<WindowFunctionType> WF_percentile<int64_t>::makeFunct
                                                                                     WindowFunctionColumn*);
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_percentile.h

@@ -48,4 +48,3 @@ class WF_percentile : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_ranking.cpp

@@ -145,4 +145,3 @@ void WF_ranking::operator()(int64_t b, int64_t e, int64_t c)
 }
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_ranking.h

@@ -46,4 +46,3 @@ class WF_ranking : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_row_number.cpp

@@ -86,4 +86,3 @@ void WF_row_number::operator()(int64_t b, int64_t e, int64_t c)
 }
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_row_number.h

@@ -45,4 +45,3 @@ class WF_row_number : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_stats.cpp

@@ -239,4 +239,3 @@ template boost::shared_ptr<WindowFunctionType> WF_stats<int64_t>::makeFunction(i
                                                                                WindowFunctionColumn*);
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_stats.h

@@ -48,4 +48,3 @@ class WF_stats : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_sum_avg.cpp

@@ -306,4 +306,3 @@ template boost::shared_ptr<WindowFunctionType> WF_sum_avg<int64_t, long double>:
     int, const string&, int, WindowFunctionColumn*);
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_sum_avg.h

@@ -60,4 +60,3 @@ class WF_sum_avg : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/wf_udaf.cpp

@@ -1191,4 +1191,3 @@ void WF_udaf::operator()(int64_t b, int64_t e, int64_t c)
   fPrev = c;
 }
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/wf_udaf.h

@@ -112,4 +112,3 @@ class WF_udaf : public WindowFunctionType
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/windowframe.cpp

@@ -81,4 +81,3 @@ const string WindowFrame::toString() const
 }
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/windowframe.h

@@ -119,4 +119,3 @@ class WindowFrame
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/windowfunction.cpp

@@ -259,4 +259,3 @@ void WindowFunction::sort(std::vector<RowPosition>::iterator v, uint64_t n)
 }
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/windowfunction.h

@@ -111,4 +111,3 @@ class WindowFunction
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4:

utils/windowfunction/windowfunctiontype.cpp

@@ -797,4 +797,3 @@ void WindowFunctionType::constParms(const std::vector<SRCP>& functionParms)
 }
 
 }  // namespace windowfunction
-// vim:ts=4 sw=4:

utils/windowfunction/windowfunctiontype.h

@@ -303,4 +303,3 @@ extern std::map<int, std::string> colType2String;
 
 }  // namespace windowfunction
 
-// vim:ts=4 sw=4: