Merge branch '10.0-galera' into 10.1

This commit is contained in:
Sergei Golubchik 2016-11-02 13:44:07 +01:00
commit a98c85bb50
162 changed files with 5627 additions and 860 deletions

View file

@ -32,4 +32,10 @@ if ($node_3)
--connection $node_3
--eval SET @@global.auto_increment_offset = $auto_increment_offset_node_3;
}
if ($node_4)
{
--connection $node_4
--eval SET @@global.auto_increment_offset = $auto_increment_offset_node_4;
}
--enable_query_log

View file

@ -13,6 +13,8 @@
# Connection handle for 2nd node
# $node_3 (optional)
# Connection handle for 3rd node
# $node_4 (optional)
# Connection handle for 4th node
if (!$node_1)
{
@ -35,3 +37,9 @@ if ($node_3)
let $auto_increment_offset_node_3 = `SELECT @@global.auto_increment_offset`;
}
if ($node_4)
{
--connection $node_4
let $auto_increment_offset_node_4 = `SELECT @@global.auto_increment_offset`;
}