diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 17:08:42 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 17:08:42 +0200 |
commit | 8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d (patch) | |
tree | 3e2c81b24b86a194243fe3e7913393e96de99991 /mysql-test/suite/innodb/r/monitor.result | |
parent | c4938eafc594d6d64e5a17be13c337ada0beb63d (diff) | |
parent | fb0808c450849e00993fa38839f33969a9daf7e8 (diff) | |
download | mariadb-git-8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/innodb/r/monitor.result')
-rw-r--r-- | mysql-test/suite/innodb/r/monitor.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/r/monitor.result b/mysql-test/suite/innodb/r/monitor.result index 67de3756c1d..15d6fc43ade 100644 --- a/mysql-test/suite/innodb/r/monitor.result +++ b/mysql-test/suite/innodb/r/monitor.result @@ -702,7 +702,7 @@ SET @end = (SELECT COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME = 'lock_rec_lock_created'); SELECT @end - @start; @end - @start -0 +1 # Records must not be S/X-locked if a table is X-locked. SET @start = @end; SET autocommit = 0; |