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

Reduce binlog_change_master output

Browse Source 
The output was very verbose and did not provide a lot of information. This
made it hard to see what is going on in the test.
This commit is contained in:
Markus Mäkelä
2018-01-10 13:20:46 +02:00
parent f54038f378
commit 96a8d20439
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
maxscale-system-test/binlog_change_master.cpp
View File

@ -36,14 +36,12 @@ int transaction(MYSQL * conn, int N)
int local_result = 0; int local_result = 0;
char sql[1000000]; char sql[1000000];
Test->tprintf("START TRANSACTION\n");
local_result += execute_query(conn, (char *) "START TRANSACTION"); local_result += execute_query(conn, (char *) "START TRANSACTION");
if (local_result != 0) if (local_result != 0)
{ {
Test->tprintf("START TRANSACTION Failed\n"); Test->tprintf("START TRANSACTION Failed\n");
return local_result; return local_result;
} }
Test->tprintf("SET autocommit = 0\n");
local_result += execute_query(conn, (char *) "SET autocommit = 0"); local_result += execute_query(conn, (char *) "SET autocommit = 0");
if (local_result != 0) if (local_result != 0)
{ {
@ -52,7 +50,6 @@ int transaction(MYSQL * conn, int N)
} }
create_insert_string(sql, N_INSERTS, N); create_insert_string(sql, N_INSERTS, N);
Test->tprintf("INSERT\n");
local_result += execute_query(conn, sql); local_result += execute_query(conn, sql);
if (local_result != 0) if (local_result != 0)
{ {
@ -60,7 +57,6 @@ int transaction(MYSQL * conn, int N)
return local_result; return local_result;
} }
Test->tprintf("COMMIT\n");
local_result += execute_query(conn, (char *) "COMMIT"); local_result += execute_query(conn, (char *) "COMMIT");
if (local_result != 0) if (local_result != 0)
{ {
@ -150,8 +146,8 @@ int main(int argc, char *argv[])
{ {
sprintf(sql, "select count(*) from t1 where fl=%d;", j); sprintf(sql, "select count(*) from t1 where fl=%d;", j);
find_field(Test->repl->nodes[i_n], sql, (char *) "count(*)", rep); find_field(Test->repl->nodes[i_n], sql, (char *) "count(*)", rep);
Test->tprintf("Transaction %d put %s rows\n", j, rep);
sscanf(rep, "%d", &rep_d); sscanf(rep, "%d", &rep_d);
if ((rep_d != N_INSERTS) && (j != (failed_transaction_num - 1))) if ((rep_d != N_INSERTS) && (j != (failed_transaction_num - 1)))
{ {
Test->add_result(1, "Transaction %d did not put data into slave\n", j); Test->add_result(1, "Transaction %d did not put data into slave\n", j);
@ -325,7 +321,6 @@ void *transaction_thread( void *ptr )
while ((exit_flag == 0) && i_trans < trans_max) while ((exit_flag == 0) && i_trans < trans_max)
{ {
Test->tprintf("Transaction %d\n", i_trans);
trans_result = transaction(conn, i_trans); trans_result = transaction(conn, i_trans);
if (trans_result != 0) if (trans_result != 0)
{ {