hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up setup_binlog_gtid

Browse Source 
Removed redundant operations and cleaned up unused code.
This commit is contained in:
Markus Mäkelä
2017-10-05 08:14:39 +03:00
committed by Johan Wikman
parent 8be898d1d3
commit 16530b4a97
1 changed files with 10 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
maxscale-system-test/setup_binlog_gtid.cpp
View File

@ -1,48 +1,23 @@
/**
* @file setup_binlog_gtid.cpp test of simple binlog router setup
* @file setup_binlog_gtid.cpp - Basic GTID testing of binlogrouter
*/
#include <iostream>
#include "testconnections.h"
#include "maxadmin_operations.h"
#include "sql_t1.h"
#include "test_binlog_fnc.h"
int main(int argc, char *argv[])
{
TestConnections * Test = new TestConnections(argc, argv);
Test->set_timeout(3000);
int options_set = 3;
if (Test->smoke)
{
options_set = 1;
}
TestConnections test(argc, argv);
test.binlog_master_gtid = true;
test.binlog_slave_gtid = true;
Test->repl->connect();
execute_query(Test->repl->nodes[0], (char *) "DROP TABLE IF EXISTS t1;");
Test->repl->close_connections();
sleep(5);
test.start_binlog();
test_binlog(&test);
Test->binlog_master_gtid = true;
Test->binlog_slave_gtid = true;
// for (int option = 0; option < options_set; option++)
//{
// Test->binlog_cmd_option = option;
Test->start_binlog();
test_binlog(Test);
//}
test.check_log_err("SET NAMES utf8mb4", false);
test.check_log_err("set autocommit=1", false);
test.check_log_err("select USER()", false);
Test->check_log_err("SET NAMES utf8mb4", false);
Test->check_log_err("set autocommit=1", false);
Test->check_log_err("select USER()", false);
int rval = Test->global_result;
delete Test;
return rval;
return test.global_result;
}