7cdef05710Fix issue with OK being split across multiple reads
Mark Riddoch
2014-06-27 09:27:43 +01:00
20637ee224Removed unnecessary SERVER pointer from dcb.c:dcb_call_foreach(), changed declaration and call accordingly.
VilhoRaatikka
2014-06-27 10:54:11 +03:00
edf9f0c59cListed and described shortly max_slave_connections and server_options=slave_selection_criteria parameters.
VilhoRaatikka
2014-06-27 10:50:56 +03:00
c13275c0e7merge from develop
MassimilianoPinto
2014-06-26 21:27:22 +02:00
1a33277f72Merge from develop
MassimilianoPinto
2014-06-26 17:08:21 +02:00
4d2e43a2d9code cleanup and documentation
MassimilianoPinto
2014-06-26 16:56:21 +02:00
10ac2cb6e6add /etc/init.d/maxscale to the package
Timofey Turenko
2014-06-26 15:23:22 +03:00
d8ac0467deAdded comments for SHOW SLAVE STATUS
MassimilianoPinto
2014-06-26 14:14:37 +02:00
dbf12f6183Added new rules for Master selection
MassimilianoPinto
2014-06-25 18:38:33 +02:00
5a65bc2aaaget_root_master routine available
MassimilianoPinto
2014-06-25 17:19:14 +02:00
22827e7c8dMerge pull request #6 from skysql/MAX-99
Vilho Raatikka
2014-06-25 18:06:22 +03:00
1d1da398d4Merge branch 'develop' into MAX-99
VilhoRaatikka
2014-06-25 17:50:29 +03:00
dff18bf9bbNecessary checks and macros for prepared statement support implementation.
VilhoRaatikka
2014-06-25 17:37:37 +03:00
7ff14e23a5Support for prepared statement, namely support for following comands : COM_STMT_PREPARE, COM_STMT_EXECUTE, COM_STMT_SEND_LONG_DATA, COM_STMT_RESET, COM_STMT_CLOSE, SQLCOM_PREPARE, SQLCOM_EXECUTE, SQLCOM_DEALLOCATE_PREPARE (DEALLOCATE/DROP PREPARE stmt). All prepare commands are executed in every backend server currently connected.
VilhoRaatikka
2014-06-25 17:15:46 +03:00
2eafe15bcaAdded master_host update in the loop
MassimilianoPinto
2014-06-25 15:51:29 +02:00
2d128de85fReplaced MySQL command macros with enumerated type. Each command has prefix 'MYSQL_' otherwise they match with those listed in mariadb-5.5 mysql_com.h.
VilhoRaatikka
2014-06-25 15:48:55 +03:00
d30ff534b9In dcb.c:dcb_read if there is nothing anymore to read from socket, it wasn't caught anyway. Added test for that case and immediate exit in that case.
VilhoRaatikka
2014-06-25 15:37:44 +03:00
fa08a141e4Fix to reload dbusers Tidyup show service output
Mark Riddoch
2014-06-25 13:01:32 +01:00
792ae454f4Add support for #!../maxadmin scripts
Mark Riddoch
2014-06-25 10:00:59 +01:00
c14700fcffAdded documentation to new routines
MassimilianoPinto
2014-06-25 10:21:30 +02:00
e0596b7d72Merge branch 'develop' into MAX-65
Mark Riddoch
2014-06-25 08:28:17 +01:00
65c42b93cfIf backend fails and sets session state to SESSION_STATE_STOPPING before session is in state SESSION_STATE_ROUTER_READY, sessoin.c:session_alloc overwrites the session state by SESSION_STATE_ROUTER_READY. Protected session state modification and added check before changing the state.
VilhoRaatikka
2014-06-24 21:59:42 +03:00
c30e270768Removed dcb->command from DCB structure as it was used for session commands but not anymore. Corrected debug assertion in dcb_final_free because DCB can be freed also when DCB is being created, that is, state is DCB_STATE_ALLOC.
VilhoRaatikka
2014-06-24 21:56:15 +03:00
442ac7fefbAdded GWBUF type GWBUF_TYPE_SINGLE_STMT to indicate that buffer only includes single complete stmt. Added macro for checking the flag and changed existing routines as necessary.
VilhoRaatikka
2014-06-24 21:51:54 +03:00
619aeb4afaQuery classifier can keep parse tree after the function that created it returns. Parse tree can then be queried from outside. Added skygw_query_classifier_get_stmtname which returns the name of statement, and skygw_query_classifier_free which frees mysql handle, parse tree and thread context (thd).
VilhoRaatikka
2014-06-24 21:45:00 +03:00
a652e875b5Support for multipacket statements
Mark Riddoch
2014-06-24 17:59:29 +01:00
fe846885d5depth and master_id fields added
MassimilianoPinto
2014-06-17 13:05:03 +02:00
49163a4c43Merge branch 'develop' into MAX-11
VilhoRaatikka
2014-06-16 19:53:19 +03:00
4f03c775e5sescmd_cursor_reset didn't reset cursor's property pointer which made reset ineffective.
VilhoRaatikka
2014-06-16 13:40:45 +03:00
189793f992Clean up some compiler warnings
Mark Riddoch
2014-06-16 08:40:04 +01:00
9f6a1061c6Config fix
Mark Riddoch
2014-06-16 08:10:34 +01:00
850603171bImprovements to CLI commands and client
Mark Riddoch
2014-06-16 07:57:12 +01:00
70ba1f028aFixed bug in generation of execution time in report
Mark Riddoch
2014-06-15 23:03:41 +01:00
0200ca4e24Some things weren't switched off from product build.
VilhoRaatikka
2014-06-16 00:31:14 +03:00
5bcae64538When protocol closes DCB it calls dcb_close instead of dcb->func.close. dcb_close then calls dcb->func.close. This is now changed to all protocols and routers.
VilhoRaatikka
2014-06-15 23:44:07 +03:00
8103ac6052Merge branch 'develop' into MAX-65
Mark Riddoch
2014-06-14 12:54:08 +01:00
c2fa112407Remove .swp file which was added by mistake
Mark Riddoch
2014-06-13 23:42:21 +01:00
719503e471Addition of new client utility, maxadmin.
Mark Riddoch
2014-06-13 23:40:07 +01:00
09d20d1059Modified dcb_call_foreach so that it doesn't hold spinlock (dcbspin) continuously because it caused deadlock when new slaves were tried to connect with.
VilhoRaatikka
2014-06-13 14:52:04 +03:00
dfc9141a38Whenever monitored server's state changes, a callback, router_handle_state_switch is called for each DCB in MaxScale session. The DCB referring to the server in question will be passed as parameter to backend DCB's hangup function.
VilhoRaatikka
2014-06-13 13:30:50 +03:00
480c842308Improved diagnostics in filters
Mark Riddoch
2014-06-13 08:50:28 +01:00
966d3f3fd4Enhancements to topfilter and qlafilter
Mark Riddoch
2014-06-13 08:35:23 +01:00
1868210a59Enhancements to topfilter and qlafilter
Mark Riddoch
2014-06-13 08:35:23 +01:00
9eda859724Added callback for rwsplit router which traverses through every rwsplit router session and for each rses, all backend references. Each bref is checked whether it is connected to non responsive server and if it is flagged to be waiting for response from the non-responsive backend. For matching ones, backend protocol's hangup function is called.
VilhoRaatikka
2014-06-13 08:01:26 +03:00
15ff1fd26aFixed many error handling issues regading to timing and multiple threads. Added flags to those backend references which have sent something to backend which causes the backend to send results or reply back. Didn't add removal of the flag since there's currently no way to tell whether response from backend contains anything else than session command reply - which aren't counted when BREF_WAITING_RESULT is set and cleared.
VilhoRaatikka
2014-06-12 23:22:51 +03:00
e95b6cc0d9dcb.c, gw_utils.c, mysql_server_protocol.h, mysql_client.c : Replaced gw_read_gwbuff with dcb_read in mysql_client.c:gw_read_client_event.
VilhoRaatikka
2014-06-12 19:02:47 +03:00
d17315b2cdUpdated QLA filter to allow for regex matches and client address matches to control the statements that are logged.
Mark Riddoch
2014-06-11 23:55:29 +01:00
02330093ccAdded test for session commands.
VilhoRaatikka
2014-06-11 15:33:42 +03:00
2963a8448bImplement non-blocking alternative to mutexes for read serialisation
Mark Riddoch
2014-06-10 17:59:49 +01:00
a8def0d670Additional error checking and documentation.
Mark Riddoch
2014-06-10 11:57:48 +01:00
77e1426dbfInitial upstream fitlering implementation.
Mark Riddoch
2014-06-09 21:13:28 +01:00