You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
Merge branch 'develop-1.2' into develop-merge-up-20190328
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
Copyright (C) 2016 MariaDB Corporaton
|
||||
Copyright (C) 2019 MariaDB Corporaton
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
@ -898,7 +898,13 @@ ReturnedColumn* buildWindowFunctionColumn(Item* item, gp_walk_info& gwi, bool& n
|
||||
setError(gwi.thd, ER_CHECK_NOT_IMPLEMENTED, gwi.parseErrorText);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#if 0
|
||||
if (item_sum->sum_func() != Item_sum::UDF_SUM_FUNC &&
|
||||
item_sum->sum_func() != Item_sum::SUM_FUNC &&
|
||||
item_sum->sum_func() != Item_sum::SUM_DISTINCT_FUNC &&
|
||||
item_sum->sum_func() != Item_sum::AVG_FUNC &&
|
||||
item_sum->sum_func() != Item_sum::AVG_DISTINCT_FUNC)
|
||||
#endif
|
||||
if (item_sum->sum_func() != Item_sum::UDF_SUM_FUNC)
|
||||
{
|
||||
ac->resultType(colType_MysqlToIDB(item_sum));
|
||||
|
Reference in New Issue
Block a user