diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2008-10-02 13:18:36 +0200 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2008-10-02 13:18:36 +0200 |
| commit | b3ed9a5b4067eaae35483dd3c43dc3d76a168f44 (patch) | |
| tree | 1093ec95caa44b9c079508d692962e496caffd14 /mysql-test | |
| parent | 369206342c511801560cc93215a7470c5c2b1d44 (diff) | |
| parent | 342235aec8db2fd4e9010a0688ba6f104fdf8253 (diff) | |
| download | mariadb-git-b3ed9a5b4067eaae35483dd3c43dc3d76a168f44.tar.gz | |
Merge 5.0 -> 5.1 of fix for
Bug#38762 main.federated_bug_25714 fails sporadically
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/federated_bug_25714.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/federated_bug_25714.test | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/mysql-test/r/federated_bug_25714.result b/mysql-test/r/federated_bug_25714.result index cad487ec791..5730eedc246 100644 --- a/mysql-test/r/federated_bug_25714.result +++ b/mysql-test/r/federated_bug_25714.result @@ -9,7 +9,9 @@ DROP DATABASE IF EXISTS federated; CREATE DATABASE federated; DROP DATABASE IF EXISTS federated; CREATE DATABASE federated; -SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT; +SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT; +SET @@GLOBAL.CONCURRENT_INSERT= 0; +SET @OLD_SLAVE_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT; SET @@GLOBAL.CONCURRENT_INSERT= 0; DROP TABLE IF EXISTS federated.bug_13118_table; CREATE TABLE federated.t1 ( @@ -51,9 +53,10 @@ id value 7 54 8 55 DROP TABLE federated.t1; +SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT; DROP TABLE federated.t1; +SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT; DROP TABLE IF EXISTS federated.t1; DROP DATABASE IF EXISTS federated; DROP TABLE IF EXISTS federated.t1; DROP DATABASE IF EXISTS federated; -SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT; diff --git a/mysql-test/t/federated_bug_25714.test b/mysql-test/t/federated_bug_25714.test index 26ff143135a..6d112cae5b8 100644 --- a/mysql-test/t/federated_bug_25714.test +++ b/mysql-test/t/federated_bug_25714.test @@ -1,15 +1,16 @@ --source include/have_bug25714.inc source include/federated.inc; -connection default; - +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_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT; +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 @@ -46,11 +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; -connection default; -SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT; |