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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-07-05 13:53:14 +03:00
parent 152eed7f63 9e039ed024
commit 702f8aaed4
5 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/build_deb_local.sh
View File

@ -76,5 +76,5 @@ if [ "$BUILD_RABBITMQ" == "yes" ] ; then
cp _build/*.deb . cp _build/*.deb .
cp *.deb .. cp *.deb ..
fi fi
sudo dpkg -i ../maxscale*.dev sudo dpkg -i ../maxscale*.deb
set +x set +x

4
maxscale-system-test/CMakeLists.txt
View File

@ -1019,6 +1019,10 @@ add_test_executable(mxs1926_killed_server.cpp mxs1926_killed_server mxs1926_kill
# https://jira.mariadb.org/browse/MXS-1932 # https://jira.mariadb.org/browse/MXS-1932
add_test_executable(mxs1932_hidden_cnf.cpp mxs1932_hidden_cnf replication LABELS REPL_BACKEND) add_test_executable(mxs1932_hidden_cnf.cpp mxs1932_hidden_cnf replication LABELS REPL_BACKEND)
# MXS-1958: Users with insert-only privileges don't work
# https://jira.mariadb.org/browse/MXS-1958
add_test_executable(mxs1958_insert_priv.cpp mxs1958_insert_priv replication LABELS REPL_BACKEND)
configure_file(templates.h.in templates.h @ONLY) configure_file(templates.h.in templates.h @ONLY)
include(CTest) include(CTest)

6
maxscale-system-test/Documentation/RELEASE.md
View File

@ -26,6 +26,10 @@ also the version number being changed.
So, ensure that the `maxscale-x.y.z-ttN` has been created and pushed So, ensure that the `maxscale-x.y.z-ttN` has been created and pushed
to the repository. to the repository.
```
git push origin refs/tags/maxscale-x.y.z-ttN
```
**NOTE** The tentative suffix - `-ttN` - is **only** used when **NOTE** The tentative suffix - `-ttN` - is **only** used when
specifying the tag for the build, it must **not** be present in specifying the tag for the build, it must **not** be present in
any other names or paths. any other names or paths.
@ -140,7 +144,7 @@ the final tag
``` ```
$ git checkout maxscale-x.y.z-ttN $ git checkout maxscale-x.y.z-ttN
$ git tag -a -m "Tag for MaxScale x.y.z" maxscale-x.y.z $ git tag -a -m "Tag for MaxScale x.y.z" maxscale-x.y.z
$ git push --tags origin $ git push origin refs/tags/maxscale-x.y.z
``` ```
and remove the tentative tag(s) and remove the tentative tag(s)
``` ```

25
maxscale-system-test/mxs1958_insert_priv.cpp Normal file
View File

@ -0,0 +1,25 @@
#include "testconnections.h"
int main(int argc, char** argv)
{
TestConnections test(argc, argv);
test.repl->connect();
execute_query(test.repl->nodes[0], "CREATE USER 'insert_only'@'%%' IDENTIFIED BY 'insert_only'");
execute_query(test.repl->nodes[0], "CREATE DATABASE insert_db");
execute_query(test.repl->nodes[0], "CREATE TABLE insert_db.t1(id INT)");
execute_query(test.repl->nodes[0], "GRANT INSERT ON insert_db.t1 TO 'insert_only'@'%%'");
test.repl->sync_slaves();
MYSQL* conn = open_conn(test.maxscales->rwsplit_port[0], test.maxscales->IP[0], "insert_only", "insert_only", false);
test.assert(mysql_errno(conn) == 0, "User without SELECT privileges should be allowed to connect");
mysql_close(conn);
execute_query(test.repl->nodes[0], "DROP USER 'insert_only'@'%%'");
execute_query(test.repl->nodes[0], "DROP DATABASE insert_db");
test.repl->sync_slaves();
test.repl->disconnect();
return test.global_result;
}

5
server/core/gateway.cc
View File

@ -1899,12 +1899,9 @@ int main(int argc, char **argv)
goto return_main; goto return_main;
} }
MXS_NOTICE("MariaDB MaxScale %s started", MAXSCALE_VERSION); MXS_NOTICE("MariaDB MaxScale %s started (Commit: %s)", MAXSCALE_VERSION, MAXSCALE_COMMIT);
MXS_NOTICE("MaxScale is running in process %i", getpid()); MXS_NOTICE("MaxScale is running in process %i", getpid());
#ifdef SS_DEBUG
MXS_NOTICE("Commit: %s", MAXSCALE_COMMIT);
#endif
cleanup_old_process_datadirs(); cleanup_old_process_datadirs();
if (!cnf->config_check) if (!cnf->config_check)
{ {