Merge branch '2.2' into develop

This commit is contained in:
Esa Korhonen
2018-09-13 13:08:25 +03:00
committed by Timofey Turenko
13 changed files with 34 additions and 51 deletions

View File

@ -93,15 +93,10 @@ int main(int argc, char* argv[])
for (int i = 0; i < iterations; i++)
{
Test->set_timeout(15);
Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0], "user", "pass2", (char*) "test"),
"change_user failed! %",
mysql_error(Test->maxscales->conn_rwsplit[0]));
Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0],
Test->maxscales->user_name,
Test->maxscales->password,
(char*) "test"),
"change_user failed! %s",
mysql_error(Test->maxscales->conn_rwsplit[0]));
Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0], "user", "pass2", (char *) "test"),
"change_user failed! %s", mysql_error(Test->maxscales->conn_rwsplit[0]));
Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0], Test->maxscales->user_name, Test->maxscales->password,
(char *) "test"), "change_user failed! %s", mysql_error(Test->maxscales->conn_rwsplit[0]));
}
Test->tprintf("Waiting for all threads to finish");