diff options
Diffstat (limited to 'sql/debug_sync.cc')
| -rw-r--r-- | sql/debug_sync.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index 19ea40106df..af541b1bb32 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -1,4 +1,5 @@ /* Copyright (c) 2009, 2013, Oracle and/or its affiliates. + Copyright (c) 2009, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -855,8 +856,7 @@ static char *debug_sync_token(char **token_p, uint *token_length_p, DBUG_ASSERT(ptr); /* Skip leading space */ - ptr+= system_charset_info->cset->scan(system_charset_info, - ptr, ptrend, MY_SEQ_SPACES); + ptr+= system_charset_info->scan(ptr, ptrend, MY_SEQ_SPACES); if (!*ptr) { ptr= NULL; @@ -867,8 +867,7 @@ static char *debug_sync_token(char **token_p, uint *token_length_p, *token_p= ptr; /* Find token end. */ - ptr+= system_charset_info->cset->scan(system_charset_info, - ptr, ptrend, MY_SEQ_NONSPACES); + ptr+= system_charset_info->scan(ptr, ptrend, MY_SEQ_NONSPACES); /* Get token length. */ *token_length_p= (uint)(ptr - *token_p); @@ -878,7 +877,7 @@ static char *debug_sync_token(char **token_p, uint *token_length_p, { DBUG_ASSERT(ptr < ptrend); /* Get terminator character length. */ - uint mbspacelen= my_charlen_fix(system_charset_info, ptr, ptrend); + uint mbspacelen= system_charset_info->charlen_fix(ptr, ptrend); /* Terminate token. */ *ptr= '\0'; @@ -887,8 +886,7 @@ static char *debug_sync_token(char **token_p, uint *token_length_p, ptr+= mbspacelen; /* Skip trailing space */ - ptr+= system_charset_info->cset->scan(system_charset_info, - ptr, ptrend, MY_SEQ_SPACES); + ptr+= system_charset_info->scan(ptr, ptrend, MY_SEQ_SPACES); } end: |