Commit 7a12b01c authored by Matthias Leich's avatar Matthias Leich
Browse files

Merge 5.0 -> 5.1 of fix for 

Bug#38762 main.federated_bug_25714 fails sporadically
parents 766803d5 8399eb76

mysql-test/r/federated_bug_25714.result

+5 −2
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/federated_bug_25714.test

+7 −5
Original line number Diff line number Diff line 
--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;