diff options
author | Monty <monty@mariadb.org> | 2019-05-02 16:11:32 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2019-05-02 16:11:32 +0300 |
commit | 0cc7c6085e2caa71ad21eca6f19f5cca45457660 (patch) | |
tree | 26eff3f9b131c93afedbca773a60f0f654480592 /mysql-test/main/flush_read_lock.test | |
parent | 2b7e080faece853f463f6f546066d54e1cbc330b (diff) | |
download | mariadb-git-0cc7c6085e2caa71ad21eca6f19f5cca45457660.tar.gz |
Enable mysqlcheck and flush_read_lock tests
- Updated results
- Run mysqlcheck without --user-stat-tables=PREFERABLY to keep results
consistent
- Don't allow one to run analyze table under FTWRL as analyze table
nowadays has to update status tables.
Diffstat (limited to 'mysql-test/main/flush_read_lock.test')
-rw-r--r-- | mysql-test/main/flush_read_lock.test | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test index f39dbecf4a9..786c1747c20 100644 --- a/mysql-test/main/flush_read_lock.test +++ b/mysql-test/main/flush_read_lock.test @@ -199,11 +199,13 @@ let $cleanup_stmt1= alter event e1 comment ''; --echo # --echo # 2) ANALYZE TABLE statement is compatible with FTWRL. --echo # See Bug#43336 ANALYZE and OPTIMIZE do not honour ---echo # --read-only for a discussion why. +--echo # --read-only as they update status tables. --echo # +let $skip_3rd_check= 1; let $statement= analyze table t1_base; let $cleanup_stmt= ; ---source include/check_ftwrl_compatible.inc +--source include/check_ftwrl_incompatible.inc +let $skip_3rd_check= ; --echo # --echo # 3) BEGIN, ROLLBACK and COMMIT statements. @@ -1712,7 +1714,7 @@ set autocommit= 1; --echo # 39.1.a) ANALYZE TABLE for transactional table is incompatible with --echo # FTWRL. flush tables with read lock; ---echo # Implicit commits are allowed under FTWRL. +--error ER_CANT_UPDATE_WITH_READLOCK analyze table t3_trans; unlock tables; --echo # |