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

Move alloc.cc to maxbase

Browse Source 
Only renames the functions. Macro names are left as is to keep the diff
small.
This commit is contained in:
Esa Korhonen
2018-11-30 15:21:07 +02:00
parent 0c7e737eb7
commit 760f2ff34c
8 changed files with 75 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/binlogrouter/blr.cc
View File

@ -2404,7 +2404,7 @@ static void errorReply(MXS_ROUTER* instance,
{
free(router->m_errmsg);
}
router->m_errmsg = mxs_strdup("#28000 Authentication with master server failed");
router->m_errmsg = mxb_strdup("#28000 Authentication with master server failed");
/* set mysql_errno */
router->m_errno = 1045;

4
server/modules/routing/binlogrouter/blr_slave.cc
View File

@ -7763,12 +7763,12 @@ static bool blr_handle_set_stmt(ROUTER_INSTANCE* router,
v_len = strlen(word);
if (v_len > 6)
{
new_val = mxs_strndup_a(word, v_len - 6);
new_val = mxb_strndup_a(word, v_len - 6);
slave->heartbeat = atoi(new_val) / 1000;
}
else
{
new_val = mxs_strndup_a(word, v_len);
new_val = mxb_strndup_a(word, v_len);
slave->heartbeat = atoi(new_val) / 1000000;
}