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

Fix build failures on CentOS 6

Browse Source 
Removed superfluous thread_local storage specifier from adminusers.cc and
fixed signed to unsigned integer comparisons in qc_sqlite.cc.
This commit is contained in:
Markus Mäkelä
2017-08-02 15:42:05 +03:00
parent 7d8407ff22
commit 92bc3f046e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
query_classifier/qc_sqlite/qc_sqlite.cc
View File

@ -139,7 +139,7 @@ static bool is_sequence_related_function(QcSqliteInfo* info, const char* func_na
static void log_invalid_data(GWBUF* query, const char* message); static void log_invalid_data(GWBUF* query, const char* message);
static const char* map_function_name(QC_NAME_MAPPING* function_name_mappings, const char* name); static const char* map_function_name(QC_NAME_MAPPING* function_name_mappings, const char* name);
static bool parse_query(GWBUF* query, uint32_t collect); static bool parse_query(GWBUF* query, uint32_t collect);
static void parse_query_string(const char* query, size_t len); static void parse_query_string(const char* query, int len);
static bool query_is_parsed(GWBUF* query, uint32_t collect); static bool query_is_parsed(GWBUF* query, uint32_t collect);
static bool should_exclude(const char* zName, const ExprList* pExclude); static bool should_exclude(const char* zName, const ExprList* pExclude);
static void update_field_info(QcSqliteInfo* info, static void update_field_info(QcSqliteInfo* info,
@ -736,7 +736,7 @@ static bool ensure_query_is_parsed(GWBUF* query, uint32_t collect)
return parsed; return parsed;
} }
static void parse_query_string(const char* query, size_t len) static void parse_query_string(const char* query, int len)
{ {
sqlite3_stmt* stmt = NULL; sqlite3_stmt* stmt = NULL;
const char* tail = NULL; const char* tail = NULL;

2
server/core/adminusers.cc
View File

@ -518,7 +518,7 @@ bool admin_linux_account_enabled(const char *uname)
void mxs_crypt(const char* password, const char* salt, char* output) void mxs_crypt(const char* password, const char* salt, char* output)
{ {
#if HAVE_GLIBC #if HAVE_GLIBC
thread_local struct crypt_data cdata; struct crypt_data cdata;
cdata.initialized = 0; cdata.initialized = 0;
char* pw = crypt_r(password, salt, &cdata); char* pw = crypt_r(password, salt, &cdata);
snprintf(output, MXS_CRYPT_SIZE, "%s", pw); snprintf(output, MXS_CRYPT_SIZE, "%s", pw);