Merge branch '2.2' into develop

2018-07-05 13:53:14 +03:00
parent 152eed7f63 9e039ed024
commit 702f8aaed4
5 changed files with 36 additions and 6 deletions
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -1899,12 +1899,9 @@ int main(int argc, char **argv)
        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());

-#ifdef SS_DEBUG
-    MXS_NOTICE("Commit: %s", MAXSCALE_COMMIT);
-#endif
    cleanup_old_process_datadirs();
    if (!cnf->config_check)
    {