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

Merge commit '262f1d7e471bacca6b985ec3f2cd5cb76d6e2584' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2018-10-26 12:44:57 +03:00
parent c45059f83d 262f1d7e47
commit 4d8a95d041
5 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/mxs2043_select_for_update.cpp
View File

@ -78,7 +78,7 @@ bool create_user(TestConnections& test, MYSQL* pMysql)
drop_user(test, pMysql, true);
test.try_query(pMysql, "CREATE USER '%s' IDENTIFIED by '%s'", ZUSER, ZPASSWORD);
test.try_query(pMysql, "CREATE USER '%s'@'%%' IDENTIFIED by '%s'", ZUSER, ZPASSWORD);
test.try_query(pMysql, "GRANT SELECT, UPDATE ON %s TO '%s'@'%%'", ZTABLE, ZUSER);
return test.global_result == 0;
@ -149,6 +149,8 @@ int main(int argc, char* argv[])
if (create_user(test, pMysql))
{
int rv = test.repl->connect();
test.repl->sync_slaves();
test.expect(rv == 0, "Could not connect to MS.");
if (rv == 0)

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

@ -59,5 +59,12 @@ int main(int argc, char* argv[])
test.maxscales->close_maxscale_connections(0);
// MXS-2103
test.maxscales->connect();
test.try_query(test.maxscales->conn_rwsplit[0], "CREATE TEMPORARY TABLE temp.dummy5 (dum INT);");
test.try_query(test.maxscales->conn_rwsplit[0], "INSERT INTO temp.dummy5 VALUES(1),(2);");
test.try_query(test.maxscales->conn_rwsplit[0], "SELECT * FROM temp.dummy5;");
test.maxscales->disconnect();
return test.global_result;
}