← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to mysql-test/t/federated.test

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/t/federated.test
2
2
--source include/not_embedded.inc
3
3
--source include/federated.inc
4
4
 
 
5
connection default;
 
6
 
 
7
# Disable concurrent inserts to avoid test failures when reading
 
8
# data from concurrent connections (insert might return before
 
9
# the data is actually in the table).
 
10
SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
 
11
SET @@GLOBAL.CONCURRENT_INSERT= 0;
 
12
 
5
13
connection slave;
6
14
DROP TABLE IF EXISTS federated.t1;
7
15
CREATE TABLE federated.t1 (
1857
1865
 
1858
1866
--echo End of 5.1 tests
1859
1867
source include/federated_cleanup.inc;
 
1868
 
 
1869
connection default;
 
1870
 
 
1871
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;