Merge 2.1 in 2.2

2017-11-29 11:30:33 +01:00
parent ba22e3b1db
commit 8a10b72e4d
8 changed files with 195 additions and 25 deletions
--- a/server/modules/routing/binlogrouter/blr_file.c
+++ b/server/modules/routing/binlogrouter/blr_file.c
@ -1980,10 +1980,12 @@ blr_read_events_all_events(ROUTER_INSTANCE *router,
                router->current_pos = pos;

                MXS_WARNING("an error has been found in %s. "
-                            "Setting safe pos to %lu, current pos %lu",
+                            "Setting safe pos to %lu, current pos %lu. "
+                            "ErrMsg [%s]",
                            router->binlog_name,
                            router->binlog_position,
-                            router->current_pos);
+                            router->current_pos,
+                            errmsg);

                if (fix)
                {