1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

Merge pull request #1024 from LinuxJedi/collate_warn

MCOL-3721 Allow collate and warn on ORDER BY
This commit is contained in:
Roman Nozdrin
2020-02-11 19:28:07 +03:00
committed by Patrick LeBlanc
parent 3faa1600c3
commit e0cb60dcd2
3 changed files with 27 additions and 3 deletions

View File

@ -7562,6 +7562,11 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
{
gwi.fatalParseError = true;
}
else if ((ord_item->type() == Item::FUNC_ITEM) && (((Item_func*)ord_item)->functype() == Item_func::COLLATE_FUNC))
{
push_warning(gwi.thd, Sql_condition::WARN_LEVEL_NOTE, WARN_OPTION_IGNORED, "COLLATE is ignored in ColumnStore");
continue;
}
else
{
rc = buildReturnedColumn(ord_item, gwi, gwi.fatalParseError);