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

Conflicts:
	client/Makefile
	server/core/buffer.c
	server/core/test/makefile
	server/include/buffer.h
	server/modules/filter/Makefile
	server/modules/routing/webserver.c

server/modules/include/mysql_client_server_protocol.h

@@ -102,6 +102,12 @@ typedef enum {
         MYSQL_IDLE
 } mysql_auth_state_t;
 
+typedef enum {
+        MYSQL_PROTOCOL_ALLOC,
+        MYSQL_PROTOCOL_ACTIVE,
+        MYSQL_PROTOCOL_DONE
+} mysql_protocol_state_t;
+
 
 /*
  * MySQL session specific data
@@ -270,6 +276,7 @@ typedef struct {
         server_command_t    protocol_command;             /*< session command list */
         server_command_t*   protocol_cmd_history;         /*< session command history */
         mysql_auth_state_t  protocol_auth_state;          /*< Authentication status */
+        mysql_protocol_state_t protocol_state;            /*< Protocol struct status */
         uint8_t             scramble[MYSQL_SCRAMBLE_LEN]; /*< server scramble,
         * created or received */
         uint32_t            server_capabilities;          /*< server capabilities,
@@ -299,6 +306,7 @@ typedef struct {
 
 void gw_mysql_close(MySQLProtocol **ptr);
 MySQLProtocol* mysql_protocol_init(DCB* dcb, int fd);
+void           mysql_protocol_done (DCB* dcb);
 MySQLProtocol *gw_mysql_init(MySQLProtocol *data);
 void gw_mysql_close(MySQLProtocol **ptr);
 int  gw_receive_backend_auth(MySQLProtocol *protocol);

server/modules/include/mysqlhint.h

@@ -0,0 +1,114 @@
+#ifndef _MYSQLHINT_H
+#define _MYSQLHINT_H
+/*
+ * This file is distributed as part of the SkySQL Gateway.  It is free
+ * software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation,
+ * version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright SkySQL Ab 2013
+ */
+
+/*
+ * Revision History
+ *
+ * Date		Who		Description
+ * 17-07-2014	Mark Riddoch	Initial implementation
+ */
+#include <hint.h>
+
+/* Parser tokens for the hint parser */
+typedef enum {
+	TOK_MAXSCALE = 1,
+	TOK_PREPARE,
+	TOK_START,
+	TOK_STOP,
+	TOK_EQUAL,
+	TOK_STRING,
+	TOK_ROUTE,
+	TOK_TO,
+	TOK_MASTER,
+	TOK_SLAVE,
+	TOK_SERVER,
+	TOK_EOL
+} TOKEN_VALUE;
+
+/* The tokenising return type */
+typedef struct {
+	TOKEN_VALUE	token;		// The token itself
+	char		*value;		// The string version of the token
+} HINT_TOKEN;
+
+/**
+ * A named hint set.
+ *
+ * The hint "MaxScale name PREPARE ..." can be used to defined a named set
+ * of hints that can be later applied.
+ */
+typedef struct namedhints {
+	char		*name;	/*< Hintsets name */
+	HINT		*hints;
+	struct namedhints
+			*next;	/*< Next named hint */
+} NAMEDHINTS;
+
+/**
+ * A session meaintains a stack of hints, the hints BEGIN and STOP are used
+ * push hints on and off the stack. The current top of the stack is added to
+ * any statement that does not explicitly define a hint for that signle
+ * statement.
+ */
+typedef struct hintstack {
+	HINT		*hint;
+	struct hintstack
+			*next;
+} HINTSTACK;
+
+/**
+ * The hint instance structure
+ */
+typedef struct {
+	int	sessions;
+} HINT_INSTANCE;
+
+/**
+ * A hint parser session structure
+ */
+typedef struct {
+	DOWNSTREAM	down;
+	GWBUF		*request;
+	int		query_len;
+	HINTSTACK	*stack;
+	NAMEDHINTS	*named_hints;	/* The named hints defined in this session */
+} HINT_SESSION;
+
+/* Some useful macros */
+#define	CURRENT_HINT(session)	((session)->stack ? \
+					(session)->stack->hints : NULL)
+
+/* Hint Parser State Machine */
+#define	HS_INIT		0
+#define	HS_ROUTE	1
+#define	HS_ROUTE1	2
+#define	HS_ROUTE_SERVER	3
+#define	HS_NAME		4
+#define	HS_PVALUE	5
+#define	HS_PREPARE	6
+
+
+extern HINT *hint_parser(HINT_SESSION *session, GWBUF *request);
+NAMEDHINTS* free_named_hint(NAMEDHINTS* named_hint);
+HINTSTACK*  free_hint_stack(HINTSTACK* hint_stack);
+
+
+
+#endif

server/modules/include/readwritesplit.h

@@ -67,10 +67,24 @@ typedef enum backend_type_t {
         BE_UNDEFINED=-1, 
         BE_MASTER, 
         BE_JOINED = BE_MASTER,
-        BE_SLAVE, 
+        BE_SLAVE,
         BE_COUNT
 } backend_type_t;
 
+typedef enum {
+        TARGET_MASTER       = 0x01,
+        TARGET_SLAVE        = 0x02,
+        TARGET_NAMED_SERVER = 0x04,
+        TARGET_ALL          = 0x08,
+        TARGET_RLAG_MAX     = 0x10
+} route_target_t;
+
+#define TARGET_IS_MASTER(t)       (t & TARGET_MASTER)
+#define TARGET_IS_SLAVE(t)        (t & TARGET_SLAVE)
+#define TARGET_IS_NAMED_SERVER(t) (t & TARGET_NAMED_SERVER)
+#define TARGET_IS_ALL(t)          (t & TARGET_ALL)
+#define TARGET_IS_RLAG_MAX(t)     (t & TARGET_RLAG_MAX)
+
 typedef struct rses_property_st rses_property_t;
 typedef struct router_client_session ROUTER_CLIENT_SES;