diff --git a/dbcon/mysql/ha_mcs_execplan_walks.cpp b/dbcon/mysql/ha_mcs_execplan_walks.cpp
index 813e41426..73b64c184 100644
--- a/dbcon/mysql/ha_mcs_execplan_walks.cpp
+++ b/dbcon/mysql/ha_mcs_execplan_walks.cpp
@@ -250,9 +250,15 @@ void gp_walk(const Item* item, void* arg)
     {
       Item* ncitem = const_cast<Item*>(item);
       Item_func* ifp = static_cast<Item_func*>(ncitem);
-
+      std::string funcName = ifp->func_name();
       if(ifp->arguments()[0] != nullptr && ifp->arguments()[0]->type()!= Item::FIELD_ITEM)
       {
+        logging::Message::Args args;
+        args.add(funcName);
+        gwip->fatalParseError = true;
+        gwip->parseErrorText =
+              logging::IDBErrorInfo::instance()->errorMsg(logging::ERR_DATATYPE_NOT_SUPPORT, args);
+        std::cout<<gwip->parseErrorText<<std::endl;
         return;
       }
       
diff --git a/mysql-test/columnstore/basic/t/mcol6107.test b/mysql-test/columnstore/basic/t/mcol6107.test
new file mode 100644
index 000000000..8c8c8125b
--- /dev/null
+++ b/mysql-test/columnstore/basic/t/mcol6107.test
@@ -0,0 +1,13 @@
+--disable_warnings
+DROP DATABASE IF EXISTS test_invalid_args;
+CREATE DATABASE test_invalid_args;
+USE test_invalid_args;
+--enable_warnings
+
+create table cs1(i bigint)engine=columnstore;
+
+# incorrect args - idbpartition must receive column name and it received a string literal
+--error 1815
+select count(i) from cs1 where idbpartition('i') = '0.0.1';
+# Clean UP
+DROP DATABASE test_invalid_args;
\ No newline at end of file