database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-3536 Collation

Browse Source
This commit is contained in:
David Hall
2020-06-08 17:19:07 -05:00
parent 938ee6d308
commit d289c30521
10 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
primitives/linux-port/dictionary.cpp
View File

@ -19,11 +19,6 @@
* $Id: dictionary.cpp 2122 2013-07-08 16:33:50Z bpaul $
*/
#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 <iostream>
#include <boost/scoped_array.hpp>
#include <boost/algorithm/string/trim.hpp>
@ -39,6 +34,11 @@ using namespace std;
#include "dataconvert.h"
#include <sstream>
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <m_ctype.h>
using namespace logging;
const char* nullString = " "; // this is not NULL to preempt segfaults.