Merge branch 'develop' of https://github.com/skysql/MaxScale into develop

VERSION

@@ -1 +1 @@
-0.7.0
+1.0.0

query_classifier/test/testmain.c

@@ -404,7 +404,8 @@ int main(int argc, char** argv)
         while(succp) {
                 qtest = slcursor_get_case(c);
                 qtest->qt_result_type =
-                        skygw_query_classifier_get_type(qtest->qt_query_str, f);
+                        skygw_query_classifier_get_type(qtest->qt_query_str, f,
+						&mysql);
                 succp = slcursor_step_ahead(c);
         }
         /**

server/core/Makefile

@@ -72,10 +72,10 @@ OBJ=$(SRCS:.c=.o)
 KOBJS=maxkeys.o secrets.o utils.o
 POBJS=maxpasswd.o secrets.o utils.o
 
-LIBS=-L../inih/extra -linih -lssl -lstdc++ \
-	-L$(EMBEDDED_LIB) \
+LIBS=-L$(EMBEDDED_LIB) \
+	-lmysqld \
 	-lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \
-	-lmysqld
+	-L../inih/extra -linih -lssl -lstdc++ 
 
 all:	maxscale maxkeys maxpasswd
 

server/modules/filter/qlafilter.c

@@ -50,7 +50,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A simple query logging filter"
 };

server/modules/filter/regexfilter.c

@@ -43,7 +43,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A query rewrite filter that uses regular expressions to rewite queries"
 };

server/modules/filter/tee.c

@@ -60,7 +60,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A tee piece in the filter plumbing"
 };

server/modules/filter/testfilter.c

@@ -32,7 +32,7 @@
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A simple query counting filter"
 };

server/modules/filter/topfilter.c

@@ -47,7 +47,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A top N query logging filter"
 };

server/modules/monitor/galera_mon.c

@@ -56,7 +56,7 @@ static char *version_str = "V1.2.0";
 
 MODULE_INFO	info = {
 	MODULE_API_MONITOR,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	MONITOR_VERSION,
 	"A Galera cluster monitor"
 };

server/modules/monitor/mysql_mon.c

@@ -66,7 +66,7 @@ static char *version_str = "V1.2.0";
 
 MODULE_INFO	info = {
 	MODULE_API_MONITOR,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	MONITOR_VERSION,
 	"A MySQL Master/Slave replication monitor"
 };

server/modules/protocol/maxscaled.c

@@ -40,7 +40,7 @@
 
 MODULE_INFO info = {
 	MODULE_API_PROTOCOL,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	GWPROTOCOL_VERSION,
 	"A maxscale protocol for the administration interface"
 };

server/modules/protocol/mysql_backend.c

@@ -47,7 +47,7 @@
 
 MODULE_INFO info = {
 	MODULE_API_PROTOCOL,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	GWPROTOCOL_VERSION,
 	"The MySQL to backend server protocol"
 };

server/modules/protocol/mysql_client.c

@@ -44,7 +44,7 @@
 
 MODULE_INFO info = {
 	MODULE_API_PROTOCOL,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	GWPROTOCOL_VERSION,
 	"The client to MaxScale MySQL protocol implementation"
 };

server/modules/protocol/telnetd.c

@@ -40,7 +40,7 @@
 
 MODULE_INFO info = {
 	MODULE_API_PROTOCOL,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	GWPROTOCOL_VERSION,
 	"A telnet deamon protocol for simple administration interface"
 };

server/modules/routing/cli.c

@@ -48,7 +48,7 @@
 
 MODULE_INFO 	info = {
 	MODULE_API_ROUTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	ROUTER_VERSION,
 	"The admin user interface"
 };

server/modules/routing/debugcli.c

@@ -47,7 +47,7 @@
 
 MODULE_INFO 	info = {
 	MODULE_API_ROUTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	ROUTER_VERSION,
 	"The debug user interface"
 };

server/modules/routing/readconnroute.c

@@ -93,7 +93,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_ROUTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	ROUTER_VERSION,
 	"A connection based router to load balance based on connections"
 };

server/modules/routing/readwritesplit/readwritesplit.c

@@ -35,7 +35,7 @@
 
 MODULE_INFO 	info = {
 	MODULE_API_ROUTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	ROUTER_VERSION,
 	"A Read/Write splitting router for enhancement read scalability"
 };