1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge 10.4 into 10.5

FIXME: Part of the MDEV-20699 test is disabled due to
nonderterministic result.
This commit is contained in:
Marko Mäkelä
2021-09-30 09:04:43 +03:00
34 changed files with 483 additions and 288 deletions

View File

@@ -54,7 +54,7 @@ let $trx_after= `select substr('$trx_after',9)`;
drop table t1, t2;
if ($trx_before != $trx_after)
if ($trx_before > $trx_after)
{
echo Transaction sequence mismatch: $trx_before != $trx_after;
echo Transaction sequence mismatch: $trx_before > $trx_after;
}