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

Conflicts:
	server/core/dcb.c
	server/core/poll.c
	server/modules/include/mysql_client_server_protocol.h
	server/modules/routing/readwritesplit/readwritesplit.c

server/include/buffer.h

@@ -41,9 +41,18 @@
  *
  * @endverbatim
  */
+#include <skygw_debug.h>
+
+
+typedef enum 
+{
+        GWBUF_TYPE_UNDEFINED = 0x0,
+        GWBUF_TYPE_PLAINSQL = 0x1,
+        GWBUF_TYPE_MYSQL     = 0x2
+} gwbuf_type_t;
 
 /**
- * A structure to encapsualte the data in a form that the data itself can be
+ * A structure to encapsulate the data in a form that the data itself can be
  * shared between multiple GWBUF's without the need to make multiple copies
  * but still maintain separate data pointers.
  */
@@ -64,8 +73,9 @@ typedef struct gwbuf {
 	struct gwbuf	*next;	/*< Next buffer in a linked chain of buffers */
 	void		*start;	/*< Start of the valid data */
 	void		*end;	/*< First byte after the valid data */
-	SHARED_BUF	*sbuf;	/*< The shared buffer with the real data */
+	SHARED_BUF	*sbuf;  /*< The shared buffer with the real data */
 	int		command;/*< The command type for the queue */
+	gwbuf_type_t    gwbuf_type; /*< buffer's data type information */
 } GWBUF;
 
 /*<
@@ -83,6 +93,7 @@ typedef struct gwbuf {
 /*< Consume a number of bytes in the buffer */
 #define GWBUF_CONSUME(b, bytes)	(b)->start += bytes
 
+#define GWBUF_TYPE(b) (b)->gwbuf_type
 /*<
  * Function prototypes for the API to maniplate the buffers
  */
@@ -92,6 +103,7 @@ extern GWBUF		*gwbuf_clone(GWBUF *buf);
 extern GWBUF		*gwbuf_append(GWBUF *head, GWBUF *tail);
 extern GWBUF		*gwbuf_consume(GWBUF *head, unsigned int length);
 extern unsigned int	gwbuf_length(GWBUF *head);
-
-
+extern GWBUF            *gwbuf_clone_portion(GWBUF *head, size_t offset, size_t len);
+extern GWBUF            *gwbuf_clone_transform(GWBUF *head, gwbuf_type_t type);
+extern bool             gwbuf_set_type(GWBUF *head, gwbuf_type_t type);
 #endif

server/include/dcb.h

@@ -179,7 +179,7 @@ typedef struct dcb {
 	SPINLOCK	authlock;	/**< Generic Authorization spinlock */
 
 	DCBSTATS	stats;		/**< DCB related statistics */
-
+        unsigned int    dcb_server_status; /*< the server role indicator from SERVER */
 	struct dcb	*next;		/**< Next DCB in the chain of allocated DCB's */
 	struct service	*service;	/**< The related service */
 	void		*data;		/**< Specific client data */
@@ -205,7 +205,13 @@ int           fail_accept_errno;
 #define	DCB_ISZOMBIE(x)			((x)->state == DCB_STATE_ZOMBIE)
 
 DCB             *dcb_get_zombies(void);
-int             gw_write(int fd, const void* buf, size_t nbytes);
+int             gw_write(
+#if defined(SS_DEBUG)
+        DCB*        dcb,
+#endif
+        int         fd, 
+        const void* buf, 
+        size_t      nbytes);
 int             dcb_write(DCB *, GWBUF *);
 DCB             *dcb_alloc(dcb_role_t);
 void            dcb_free(DCB *);

server/include/gw.h

@@ -54,6 +54,12 @@ int  do_read_dcb(DCB *dcb);
 int  do_read_10(DCB *dcb, uint8_t *buffer);
 int  MySQLWrite(DCB *dcb, GWBUF *queue);
 int  setnonblocking(int fd);
-int  gw_write(int fd, const void* buf, size_t nbytes);
+int  gw_write(
+#if defined(SS_DEBUG)
+        DCB*        dcb,
+#endif
+        int         fd, 
+        const void* buf, 
+        size_t      nbytes);
 int  gw_getsockerrno(int fd);
 int  parse_bindconfig(char *, unsigned short, struct sockaddr_in *);

server/include/router.h

@@ -35,6 +35,7 @@
 #include <service.h>
 #include <session.h>
 #include <buffer.h>
+#include <stdint.h>
 
 /**
  * The ROUTER handle points to module specific data, so the best we can do
@@ -74,10 +75,13 @@ typedef struct router_object {
 	void	(*diagnostics)(ROUTER *instance, DCB *dcb);
 	void    (*clientReply)(ROUTER* instance, void* router_session, GWBUF* queue, DCB *backend_dcb);
 	void    (*errorReply)(ROUTER* instance, void* router_session, char* message, DCB *backend_dcb, int action);
+        uint8_t (*getCapabilities)(ROUTER *instance, void* router_session);
 } ROUTER_OBJECT;
 
-/* Router commands */
-#define ROUTER_DEFAULT		0       /**< Standard routing */
-#define ROUTER_CHANGE_SESSION	1	/**< Route a change session */
+typedef enum router_capability_t {
+        RCAP_TYPE_UNDEFINED    = 0,
+        RCAP_TYPE_STMT_INPUT   = (1 << 0),
+        RCAP_TYPE_PACKET_INPUT = (1 << 1)
+} router_capability_t;
 
 #endif

server/include/spinlock.h

@@ -53,6 +53,8 @@ typedef struct spinlock {
 #define SPINLOCK_INIT { 0 }
 #endif
 
+#define SPINLOCK_IS_LOCKED(l) ((l)->lock != 0 ? true : false)
+	
 extern void	spinlock_init(SPINLOCK *lock);
 extern void	spinlock_acquire(SPINLOCK *lock);
 extern int	spinlock_acquire_nowait(SPINLOCK *lock);