summaryrefslogtreecommitdiff
path: root/mysql-test/main/bug39022.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-08-31 13:55:02 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-08-31 13:55:02 +0300
commit9608773f75e2ca21491ef6825c3616cdc96d1ca5 (patch)
treeec2c4a8d43eb051a395ff1aaa4be06fe345082db /mysql-test/main/bug39022.test
parent45a05fda27dc7058ce8a89f14b1daa56352adf6b (diff)
downloadmariadb-git-9608773f75e2ca21491ef6825c3616cdc96d1ca5.tar.gz
MDEV-4750 follow-up: Reduce disabling innodb_stats_persistent
This essentially reverts commit 4e89ec6692786bc1cbdce64d43d8e85a5d247dab and only disables InnoDB persistent statistics for tests where it is desirable. By design, InnoDB persistent statistics will not be updated except by ANALYZE TABLE or by STATS_AUTO_RECALC. The internal transactions that update persistent InnoDB statistics in background tasks (with innodb_stats_auto_recalc=ON) may cause nondeterministic query plans or interfere with some tests that deal with other InnoDB internals, such as the purge of transaction history.
Diffstat (limited to 'mysql-test/main/bug39022.test')
-rw-r--r--mysql-test/main/bug39022.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/bug39022.test b/mysql-test/main/bug39022.test
index d293788e58e..e07d087a320 100644
--- a/mysql-test/main/bug39022.test
+++ b/mysql-test/main/bug39022.test
@@ -40,7 +40,7 @@ SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d) LOCK IN SH
connection thread1;
--echo # should not crash
---error ER_LOCK_DEADLOCK
+--error ER_LOCK_DEADLOCK,ER_LOCK_WAIT_TIMEOUT
SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d) LOCK IN SHARE MODE; #crashes
connection thread2;