diff --git a/mysql-test/columnstore/basic/r/mcol6107-invalid-arguments.result b/mysql-test/columnstore/basic/r/mcol6107-invalid-arguments.result
index 867f12ff5..6b8b8369a 100644
--- a/mysql-test/columnstore/basic/r/mcol6107-invalid-arguments.result
+++ b/mysql-test/columnstore/basic/r/mcol6107-invalid-arguments.result
@@ -4,14 +4,32 @@ USE test_invalid_args;
 create table cs1(i bigint)engine=columnstore;
 select count(i) from cs1 where idbPartition('i') = '0.0.1';
 ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
+select count(i) from cs1 where idbPartition(1) = '0.0.1';
+ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
+select count(i) from cs1 where idbPartition(i) = '0.0.1';
+count(i)
+0
 select count(i) from cs1 where idbExtentMin('i') = '0.0.1';
 ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
 select count(i) from cs1 where idbExtentRelativeRid('i') = '0.0.1';
 ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
-select count(i) from cs1 where idbExtentMin('i') = '0.0.1';
+select count(i) from cs1 where idbExtentRelativeRid(3) = '0.0.1';
 ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
+select count(i) from cs1 where idbExtentRelativeRid(i);
+count(i)
+0
 select count(i) from cs1 where idbPm('i') = '0.0.1';
 ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
+select count(i) from cs1 where idbPm(10) = '0.0.1';
+ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
+select count(i) from cs1 where idbPm(i);
+count(i)
+0
 select count(i) from cs1 where idbSegmentDir('i') = '0.0.1';
 ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
+select count(i) from cs1 where idbSegmentDir(1) = '0.0.1';
+ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
+select count(i) from cs1 where idbSegmentDir(i);
+count(i)
+0
 DROP DATABASE test_invalid_args;
diff --git a/mysql-test/columnstore/basic/t/mcol6107-invalid-arguments.test b/mysql-test/columnstore/basic/t/mcol6107-invalid-arguments.test
index fc638d8f7..d0d51af4e 100644
--- a/mysql-test/columnstore/basic/t/mcol6107-invalid-arguments.test
+++ b/mysql-test/columnstore/basic/t/mcol6107-invalid-arguments.test
@@ -13,22 +13,51 @@ create table cs1(i bigint)engine=columnstore;
 --error 1815
 select count(i) from cs1 where idbPartition('i') = '0.0.1';
 
+--error 1815
+select count(i) from cs1 where idbPartition(1) = '0.0.1';
+
+#correct params
+select count(i) from cs1 where idbPartition(i) = '0.0.1';
+
 --error 1815
 select count(i) from cs1 where idbExtentMin('i') = '0.0.1';
 
+#--error 1815
+#select count(i) from cs1 where idbExtentMin(i) = '0.0.1';
+
+#correct params
+#select count(i) from cs1 where idbExtentMin(1) = '0.0.1';
+
 --error 1815
 select count(i) from cs1 where idbExtentRelativeRid('i') = '0.0.1';
 
 --error 1815
-select count(i) from cs1 where idbExtentMin('i') = '0.0.1';
+select count(i) from cs1 where idbExtentRelativeRid(3) = '0.0.1';
+
+#correct params
+select count(i) from cs1 where idbExtentRelativeRid(i);
 
 --error 1815
 select count(i) from cs1 where idbPm('i') = '0.0.1';
 
 --error 1815
-select count(i) from cs1 where idbSegmentDir('i') = '0.0.1';
---source ../include/drop_functions.inc
+select count(i) from cs1 where idbPm(10) = '0.0.1';
 
+#correct params
+select count(i) from cs1 where idbPm(i);
+
+--error 1815
+select count(i) from cs1 where idbSegmentDir('i') = '0.0.1';
+
+--error 1815
+select count(i) from cs1 where idbSegmentDir(1) = '0.0.1';
+
+#correct params
+select count(i) from cs1 where idbSegmentDir(i);
+
+
+
+--source ../include/drop_functions.inc
 
 # Clean UP
 DROP DATABASE test_invalid_args;