Merge branch 'develop' into firewall

Conflicts: server/modules/filter/CMakeLists.txt
2014-10-12 10:13:54 +03:00
parent c99b7c884f 34400ee551
commit 75117f2482
63 changed files with 6078 additions and 334 deletions
--- a/query_classifier/query_classifier.h
+++ b/query_classifier/query_classifier.h
@ -18,6 +18,7 @@ Copyright MariaDB Corporation Ab
 */

 /** getpid */
+#include <my_config.h>
 #include <unistd.h>
 #include <mysql.h>
 #include <skygw_utils.h>