hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge error

Browse Source
This commit is contained in:
Johan Wikman
2017-06-30 11:07:00 +02:00
parent 7297ae129c
commit b5d54292a4
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -199,32 +199,6 @@ static struct
function_name_mappings_default function_name_mappings_default
}; };
#if MYSQL_VERSION_MAJOR >= 10 && MYSQL_VERSION_MINOR >= 3
inline void get_string_and_length(const LEX_CSTRING& ls, const char** s, size_t* length)
{
*s = ls.str;
*length = ls.length;
}
#else
inline void get_string_and_length(const char* cs, const char** s, size_t* length)
{
*s = cs;
*length = cs ? strlen(cs) : 0;
}
#endif
static struct
{
qc_sql_mode_t sql_mode;
pthread_mutex_t sql_mode_mutex;
NAME_MAPPING* function_name_mappings;
} this_unit =
{
QC_SQL_MODE_DEFAULT,
PTHREAD_MUTEX_INITIALIZER,
function_name_mappings_default
};
static thread_local struct static thread_local struct
{ {
qc_sql_mode_t sql_mode; qc_sql_mode_t sql_mode;