hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into firewall

Browse Source 
Conflicts:
	server/modules/filter/test/harness.h
	server/modules/filter/test/harness_common.c
This commit is contained in:
Markus Makela
2014-11-17 18:45:01 +02:00
parent e8e1e63304 e4bf42fcf4
commit a5ece62327
6 changed files with 190 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
query_classifier/query_classifier.cc
View File

@ -30,12 +30,7 @@
# undef MYSQL_CLIENT
#endif
#include <query_classifier.h>
#include "../utils/skygw_types.h"
#include "../utils/skygw_debug.h"
#include <log_manager.h>
#include <mysql_client_server_protocol.h>
#include <my_config.h>
#include <mysql.h>
#include <my_sys.h>
#include <my_global.h>
@ -55,6 +50,12 @@
#include <strfunc.h>
#include <item_func.h>
#include "../utils/skygw_types.h"
#include "../utils/skygw_debug.h"
#include <log_manager.h>
#include <query_classifier.h>
#include <mysql_client_server_protocol.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>