database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

MCOL-4422 Remove mariadb.h and my_sys.h dependency from collation.h

Browse Source
This commit is contained in:
Alexander Barkov
2020-11-30 14:18:26 +04:00
parent 454ec4be99
commit 2ea73846b9
26 changed files with 175 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/execplan/predicateoperator.cpp
View File

@@ -92,7 +92,7 @@ void PredicateOperator::unserialize(messageqcpp::ByteStream& b)
ObjectReader::checkType(b, ObjectReader::PREDICATEOPERATOR);
//b >> fData;
Operator::unserialize(b);
cs = get_charset(fOperationType.charsetNumber, MYF(MY_WME));
cs = & datatypes::Charset(fOperationType.charsetNumber).getCharset();
}
bool PredicateOperator::operator==(const PredicateOperator& t) const
@@ -342,7 +342,7 @@ void PredicateOperator::setOpType(Type& l, Type& r)
fOperationType.colWidth = 8;
}
cs = get_charset(fOperationType.charsetNumber, MYF(MY_WME));
cs = & datatypes::Charset(fOperationType.charsetNumber).getCharset();
}
inline bool PredicateOperator::strTrimCompare(const std::string& op1, const std::string& op2)