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

MCOL-3536 Collation

Browse Source
This commit is contained in:
David Hall
2020-06-08 17:57:37 -05:00
parent d289c30521
commit f9078efbc6
38 changed files with 79 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/funcexp/func_instr.cpp
View File

@ -20,10 +20,6 @@
*
*
****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <m_ctype.h>
#include <cstdlib>
#include <string>
@ -36,6 +32,8 @@ using namespace std;
#include "utils_utf8.h"
using namespace execplan;
#include "collation.h"
namespace funcexp
{
CalpontSystemCatalog::ColType Func_instr::operationType( FunctionParm& fp, CalpontSystemCatalog::ColType& resultType )