diff options
author | Matthias Leich <Matthias.Leich@sun.com> | 2008-10-02 13:04:29 +0200 |
---|---|---|
committer | Matthias Leich <Matthias.Leich@sun.com> | 2008-10-02 13:04:29 +0200 |
commit | 342235aec8db2fd4e9010a0688ba6f104fdf8253 (patch) | |
tree | 03605b4212f9b3ed14ccb4abae998ed0db9ce0fa /mysql-test/t | |
parent | 24fe7470247f964cc771ef477b44852d8c632aa2 (diff) | |
download | mariadb-git-342235aec8db2fd4e9010a0688ba6f104fdf8253.tar.gz |
Fix for Bug#38762 main.federated_bug_25714 fails sporadically
Diffstat (limited to 'mysql-test/t')
-rw-r--r-- | mysql-test/t/federated_bug_25714.test | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/t/federated_bug_25714.test b/mysql-test/t/federated_bug_25714.test index 9c185181511..6d112cae5b8 100644 --- a/mysql-test/t/federated_bug_25714.test +++ b/mysql-test/t/federated_bug_25714.test @@ -1,8 +1,16 @@ --source include/have_bug25714.inc source include/federated.inc; +connection master; +# Disable concurrent inserts to avoid test failures when reading +# data from concurrent connections (insert might return before +# the data is actually in the table). +SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT; +SET @@GLOBAL.CONCURRENT_INSERT= 0; connection slave; +SET @OLD_SLAVE_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT; +SET @@GLOBAL.CONCURRENT_INSERT= 0; --disable_warnings DROP TABLE IF EXISTS federated.bug_13118_table; --enable_warnings @@ -39,9 +47,12 @@ SELECT LAST_INSERT_ID(); SELECT * from federated.t1; DROP TABLE federated.t1; +SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT; connection slave; DROP TABLE federated.t1; +SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT; source include/federated_cleanup.inc; + |