Merge branch '2.2' into develop

This commit is contained in:
Markus Mäkelä
2018-09-20 12:16:55 +03:00
9 changed files with 19 additions and 9 deletions

View File

@ -100,6 +100,7 @@ void different_packet_size(TestConnections* Test, bool binlog)
Test->tprintf("Restoring max_allowed_packet");
set_max_packet(Test, binlog, (char*) "set global max_allowed_packet = 1048576;");
Test->set_timeout(300);
conn = connect_to_serv(Test, binlog);
Test->try_query(conn, "DROP TABLE test.large_event");
mysql_close(conn);

View File

@ -19,6 +19,7 @@ int main(int argc, char* argv[])
different_packet_size(Test, false);
Test->set_timeout(180);
Test->repl->sync_slaves();
Test->check_maxscale_alive(0);
int rval = Test->global_result;

View File

@ -1,7 +1,7 @@
[mysqld]
expire_logs_days=7
user=mysql
server_id=1
server_id=101
wsrep_on=ON
# Row binary log format is required by Galera

View File

@ -1,7 +1,7 @@
[mysqld]
expire_logs_days=7
user=mysql
server_id=2
server_id=102
wsrep_on=ON
# Row binary log format is required by Galera

View File

@ -1,7 +1,7 @@
[mysqld]
expire_logs_days=7
user=mysql
server_id=3
server_id=103
wsrep_on=ON
# Row binary log format is required by Galera

View File

@ -1,7 +1,7 @@
[mysqld]
expire_logs_days=7
user=mysql
server_id=4
server_id=104
wsrep_on=ON
# Row binary log format is required by Galera