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

poll.c:poll_add_dcb: Addded EPOLLHUP back to flag set.
2014-09-04 12:29:06 +03:00
parent 7fcf950f8f 5e529a8296
commit 0630b2ff46
14 changed files with 162 additions and 56 deletions
--- a/server/modules/include/mysql_client_server_protocol.h
+++ b/server/modules/include/mysql_client_server_protocol.h
@ -219,7 +219,7 @@ typedef enum mysql_server_cmd {
        MYSQL_COM_QUERY,
        MYSQL_COM_FIELD_LIST,
        MYSQL_COM_CREATE_DB, 
-        MYSQL_COM_DROP_DB, 
+        MYSQL_COM_DROP_DB,
        MYSQL_COM_REFRESH, 
        MYSQL_COM_SHUTDOWN, 
        MYSQL_COM_STATISTICS,