Commit 0802e5a7 authored by Julius Goryavsky's avatar Julius Goryavsky

MDEV-34505: galera.mariadb_tzinfo_to_sql fails deterministically on Ubuntu 24.04

Fixed a sorting order condition that in its previous form could lead
to the formation of an incorrect pattern for comparing strings.
parent 02e38e2e
...@@ -2767,7 +2767,7 @@ main(int argc, char **argv) ...@@ -2767,7 +2767,7 @@ main(int argc, char **argv)
printf("set @wsrep_is_on=(%s);\n", wsrep_is_on); printf("set @wsrep_is_on=(%s);\n", wsrep_is_on);
printf("SET STATEMENT SQL_MODE='' FOR " printf("SET STATEMENT SQL_MODE='' FOR "
"SELECT concat('%%', GROUP_CONCAT(OPTION), '%%') INTO @replicate_opt " "SELECT concat('%%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%%') INTO @replicate_opt "
" FROM" " FROM"
" (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION" " (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION"
" FROM information_schema.TABLES" " FROM information_schema.TABLES"
...@@ -2778,8 +2778,7 @@ main(int argc, char **argv) ...@@ -2778,8 +2778,7 @@ main(int argc, char **argv)
" 'time_zone_transition_type'," " 'time_zone_transition_type',"
" 'time_zone_leap_second')" " 'time_zone_leap_second')"
" AND ENGINE in ('MyISAM'," " AND ENGINE in ('MyISAM',"
" 'Aria')) AS o" " 'Aria')) AS o;\n");
" ORDER BY OPTION DESC;\n");
printf("set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (%s);\n", wsrep_cannot_replicate_tz); printf("set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (%s);\n", wsrep_cannot_replicate_tz);
if (opt_skip_write_binlog) if (opt_skip_write_binlog)
/* We turn off session wsrep if we cannot replicate using galera. /* We turn off session wsrep if we cannot replicate using galera.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment