diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp
index 76ef89cc0..01ab0e52c 100644
--- a/dbcon/mysql/ha_mcs_execplan.cpp
+++ b/dbcon/mysql/ha_mcs_execplan.cpp
@@ -1692,12 +1692,6 @@ bool buildPredicateItem(Item_func* ifp, gp_walk_info* gwip)
   {
     // Convert "a <=> b" to (a = b OR (a IS NULL AND b IS NULL))"
     idbassert(gwip->rcWorkStack.size() >= 2);
-    if(std::strcmp(ifp->func_name(), "<=>") == 0)
-    {
-      gwip->fatalParseError= true;
-      gwip->parseErrorText = "<=> (null-safe equal) is not supported in Columnstore";
-      return false;
-    }
     ReturnedColumn* rhs = gwip->rcWorkStack.top();
     gwip->rcWorkStack.pop();
     ReturnedColumn* lhs = gwip->rcWorkStack.top();
diff --git a/mysql-test/columnstore/basic/r/mcol-5675.result b/mysql-test/columnstore/basic/r/mcol-5675.result
deleted file mode 100644
index a5c6fffc1..000000000
--- a/mysql-test/columnstore/basic/r/mcol-5675.result
+++ /dev/null
@@ -1,10 +0,0 @@
-DROP DATABASE IF EXISTS test_mcol5675;
-CREATE DATABASE test_mcol5675;
-USE test_mcol5675;
-CREATE TABLE person (name varchar(100) NOT NULL, surname varchar(100) DEFAULT NULL ) 
-ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ;
-insert into person (name, surname) values ('Warren', NULL), ('Charlie', 'Peterson');
-SELECT * FROM person WHERE surname <=> 1;
-ERROR HY000: Internal error: <=> (null-safe equal) is not supported in Columnstore
-DROP TABLE person;
-DROP DATABASE test_mcol5675;
diff --git a/mysql-test/columnstore/basic/r/mcs111_comparison_operators.result b/mysql-test/columnstore/basic/r/mcs111_comparison_operators.result
index 62f54a00d..25cd86f98 100644
--- a/mysql-test/columnstore/basic/r/mcs111_comparison_operators.result
+++ b/mysql-test/columnstore/basic/r/mcs111_comparison_operators.result
@@ -62,7 +62,7 @@ t1_INT	t1_DECIMAL
 103	1234.56990
 9913	98765.43210
 SELECT t1_INT, t1_DECIMAL from t1 WHERE t1_INT <=> t1_DECIMAL ORDER BY 1;
-ERROR HY000: Internal error: <=> (null-safe equal) is not supported in Columnstore
+t1_INT	t1_DECIMAL
 SELECT t1_INT, t1_DECIMAL from t1 WHERE t1_INT <> t1_DECIMAL ORDER BY 1;
 t1_INT	t1_DECIMAL
 -7299	111.99000
diff --git a/mysql-test/columnstore/basic/t/mcol-5675.test b/mysql-test/columnstore/basic/t/mcol-5675.test
deleted file mode 100644
index 406be6791..000000000
--- a/mysql-test/columnstore/basic/t/mcol-5675.test
+++ /dev/null
@@ -1,19 +0,0 @@
---disable_warnings
-DROP DATABASE IF EXISTS test_mcol5675;
---enable_warnings
-
-CREATE DATABASE test_mcol5675;
-USE test_mcol5675;
-
-CREATE TABLE person (name varchar(100) NOT NULL, surname varchar(100) DEFAULT NULL ) 
-    ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ;
-
-insert into person (name, surname) values ('Warren', NULL), ('Charlie', 'Peterson');
-
---error 1815
-SELECT * FROM person WHERE surname <=> 1;
-
-DROP TABLE person;
-
-#clear
-DROP DATABASE test_mcol5675;
\ No newline at end of file
diff --git a/mysql-test/columnstore/basic/t/mcs111_comparison_operators.test b/mysql-test/columnstore/basic/t/mcs111_comparison_operators.test
index ea6e3d257..59ecfe3c4 100644
--- a/mysql-test/columnstore/basic/t/mcs111_comparison_operators.test
+++ b/mysql-test/columnstore/basic/t/mcs111_comparison_operators.test
@@ -50,7 +50,6 @@ SELECT t1_INT, t1_DECIMAL from t1 WHERE t1_INT != t1_DECIMAL ORDER BY 1;
 SELECT t1_INT, t1_DECIMAL from t1 WHERE t1_INT = t1_DECIMAL ORDER BY 1;
 SELECT t1_INT, t1_DECIMAL from t1 WHERE t1_INT >= t1_DECIMAL ORDER BY 1;
 SELECT t1_INT, t1_DECIMAL from t1 WHERE t1_INT <= t1_DECIMAL ORDER BY 1;
---error 1815
 SELECT t1_INT, t1_DECIMAL from t1 WHERE t1_INT <=> t1_DECIMAL ORDER BY 1;
 SELECT t1_INT, t1_DECIMAL from t1 WHERE t1_INT <> t1_DECIMAL ORDER BY 1;