Merge branch 'blr' of https://github.com/mariadb-corporation/MaxScale into blr

Conflicts: server/core/gateway.c
2014-11-26 08:47:50 +00:00
parent 268f2950b7 ba44605cb0
commit 863a30c969
8 changed files with 493 additions and 249 deletions
--- a/server/modules/routing/binlog/blr_cache.c
+++ b/server/modules/routing/binlog/blr_cache.c
@ -54,6 +54,8 @@


 extern int lm_enabled_logfiles_bitmask;
+extern size_t         log_ses_count[];
+extern __thread log_info_t tls_log_info;


 /**