Commit these files, fixing bzr merge message

include/mysql_protocol.h

@@ -22,28 +22,41 @@
 #define MYSQL_SCRAMBLE_LEN GW_MYSQL_SCRAMBLE_SIZE
 #endif
 
+#define MYSQL_USER_MAXLEN 128
+#define MYSQL_DATABASE_MAXLEN 128
+
 struct dcb;
 
 /*
  * MySQL Protocol specific state data
  */
 typedef struct {
-	int fd;
-        struct dcb      *descriptor;    /* The DCB of the socket we are running on */
-        int             state;          /* Current descriptor state */
-        char            scramble[MYSQL_SCRAMBLE_LEN];
-	uint32_t server_capabilities;   /* server capabilities */
-        uint32_t client_capabilities;	/* client capabilities */
-	unsigned long tid;		/* MySQL Thread ID */
+	int		fd;				/ * The socket descriptor */
+	struct dcb	*descriptor;			/* The DCB of the socket we are running on */
+	int		state;				/* Current descriptor state */
+	char		scramble[MYSQL_SCRAMBLE_LEN];	/* server scramble, created or received */
+	uint32_t	server_capabilities;		/* server capabilities, created or received */
+	uint32_t	client_capabilities;		/* client capabilities, created or received */
+	unsigned	long tid;			/* MySQL Thread ID, in handshake */
 } MySQLProtocol;
 
+/*
+ * MySQL session specific data
+ *
+ */
+typedef struct mysql_session {
+	uint8_t client_sha1[MYSQL_SCRAMBLE_LEN];	/* SHA1(passowrd) */
+	char user[MYSQL_USER_MAXLEN];			/* username */
+	char db[MYSQL_DATABASE_MAXLEN];			/* database */
+} MYSQL_session;
+
 /* MySQL Protocol States */
 #define MYSQL_ALLOC		0	/* Allocate data */
 #define MYSQL_AUTH_SENT		1	/* Authentication handshake has been sent */
 #define MYSQL_AUTH_RECV		2	/* Received user, password, db and capabilities */
 #define MYSQL_AUTH_FAILED	3	/* Auth failed, return error packet */
-#define MYSQL_IDLE             	4	/* Auth done. Protocol is idle, waiting for statements */
-#define MYSQL_ROUTING		5
-#define MYSQL_WAITING_RESULT	6
+#define MYSQL_IDLE		4	/* Auth done. Protocol is idle, waiting for statements */
+#define MYSQL_ROUTING		5	/* The received command has been routed to backend(s) */
+#define MYSQL_WAITING_RESULT	6	/* Waiting for result set */
 
 #endif