Merge branch '2.2' into develop

2018-03-01 18:08:45 +02:00
parent a197e6c859 544e0eb60b
commit ea83420620
18 changed files with 330 additions and 117 deletions
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@ -1773,7 +1773,7 @@ void mon_process_state_changes(MXS_MONITOR *monitor, const char *script, uint64_
                master_up = true;
            }

-            if (script && *script && (events & event))
+            if (script && (events & event))
            {
                monitor_launch_script(monitor, ptr, script, monitor->script_timeout);
            }