diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index 0822123ee..a74b2abdf 100644
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -5166,7 +5166,7 @@ void gp_walk(const Item* item, void* arg)
 
                             // Trim the trailing white space from the constant
                             // string value in the where clause
-                            boost::algorithm::trim_right(cval);
+                            boost::trim_right_if(cval, boost::is_any_of(" "));
 
                             gwip->rcWorkStack.push(new ConstantColumn(cval));
                             (dynamic_cast<ConstantColumn*>(gwip->rcWorkStack.top()))->timeZone(gwip->thd->variables.time_zone->get_name()->ptr());