database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-02 06:13:16 +03:00
Code Activity

Revert "fix(plugin): MCOL 5675 - fix error message for null-safe equal (#3754)"

Browse Source 
This reverts commit 45fecde902.
This commit is contained in:
Aleksei Bukhalov
2025-10-23 14:07:02 +02:00
parent 8253b2bf72
commit 17035ab990
5 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/mysql/ha_mcs_execplan.cpp
View File

@@ -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))" // Convert "a <=> b" to (a = b OR (a IS NULL AND b IS NULL))"
idbassert(gwip->rcWorkStack.size() >= 2); 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(); ReturnedColumn* rhs = gwip->rcWorkStack.top();
gwip->rcWorkStack.pop(); gwip->rcWorkStack.pop();
ReturnedColumn* lhs = gwip->rcWorkStack.top(); ReturnedColumn* lhs = gwip->rcWorkStack.top();

10
mysql-test/columnstore/basic/r/mcol-5675.result
View File

@@ -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;

2
mysql-test/columnstore/basic/r/mcs111_comparison_operators.result
View File

@@ -62,7 +62,7 @@ t1_INT t1_DECIMAL
103 1234.56990 103 1234.56990
9913 98765.43210 9913 98765.43210
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 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; SELECT t1_INT, t1_DECIMAL from t1 WHERE t1_INT <> t1_DECIMAL ORDER BY 1;
t1_INT t1_DECIMAL t1_INT t1_DECIMAL
-7299 111.99000 -7299 111.99000

19
mysql-test/columnstore/basic/t/mcol-5675.test
View File

@@ -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;

1
mysql-test/columnstore/basic/t/mcs111_comparison_operators.test
View File

@@ -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; 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;
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;