mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 11:27:39 +02:00
Backporting Bug#37129 LDML lacks <i> rule
This commit is contained in:
parent
aea5f15e3d
commit
7e8b208d3b
5 changed files with 45 additions and 2 deletions
|
|
@ -7661,6 +7661,13 @@ static my_coll_lexem_num my_coll_lexem_next(MY_COLL_LEXEM *lexem)
|
|||
goto ex;
|
||||
}
|
||||
|
||||
if (beg[0] == '=')
|
||||
{
|
||||
beg++;
|
||||
rc= MY_COLL_LEXEM_DIFF;
|
||||
goto ex;
|
||||
}
|
||||
|
||||
if (beg[0] == '<')
|
||||
{
|
||||
for (beg++, lexem->diff= 1;
|
||||
|
|
@ -7821,6 +7828,10 @@ static int my_coll_rule_parse(MY_COLL_RULE *rule, size_t mitems,
|
|||
item.diff[1]= 0;
|
||||
item.diff[2]= 0;
|
||||
}
|
||||
else if (lexem.diff == 0)
|
||||
{
|
||||
item.diff[0]= item.diff[1]= item.diff[2]= 0;
|
||||
}
|
||||
if (nitems >= mitems)
|
||||
{
|
||||
my_coll_lexem_print_error(&lexem,errstr,errsize-1,"Too many rules");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue