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

MXS-2020 Replace ss[_info]_dassert with mxb_assert[_message]

Browse Source
This commit is contained in:
Johan Wikman
2018-08-22 09:59:02 +03:00
parent b1e405442f
commit 3f53eddbde
161 changed files with 1640 additions and 1643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/routing/binlogrouter/blr_file.cc
View File

@ -4132,7 +4132,7 @@ static int gtid_select_cb(void *data,
{
MARIADB_GTID_INFO *result = (MARIADB_GTID_INFO *)data;
ss_dassert(cols >= 4);
mxb_assert(cols >= 4);
if (values[0] &&
values[1] &&
@ -4156,11 +4156,11 @@ static int gtid_select_cb(void *data,
if (result->start > 4)
{
ss_dassert(result->end > result->start);
mxb_assert(result->end > result->start);
}
else
{
ss_dassert(result->start > 0 && result->start > 0);
mxb_assert(result->start > 0 && result->start > 0);
}
}
@ -4205,7 +4205,7 @@ bool blr_fetch_mariadb_gtid(ROUTER_SLAVE *slave,
"server_id = %" PRIu32 " AND "
"sequence = %" PRIu64 ") "
"ORDER BY id DESC LIMIT 1;";
ss_dassert(gtid != NULL);
mxb_assert(gtid != NULL);
/* Parse GTID value into its components */
if (!blr_parse_gtid(gtid, &gtid_elms))
@ -4404,7 +4404,7 @@ static int gtid_file_select_cb(void *data,
{
MARIADB_GTID_INFO *result = (MARIADB_GTID_INFO *)data;
ss_dassert(cols >= 4);
mxb_assert(cols >= 4);
if (values[0] &&
values[1] &&