a25b757134
Merge branch 'develop' into MAX-90
...
Conflicts:
server/core/server.c
server/include/server.h
server/modules/routing/readconnroute.c
2014-06-27 16:04:39 +01:00
ce2d20b70c
Fixed printf format
2014-06-27 15:52:57 +01:00
3e83174cd8
Log messages updated for Replication heartbeat
...
Log messages updated for Replication heartbeat
2014-06-27 15:10:25 +02:00
111693775b
master_id and node_id are long vars
...
master_id and node_id are long vars
2014-06-27 14:21:12 +02:00
96b6454e13
fix compile warnings
...
fix compile warnings
2014-06-27 14:11:57 +02:00
875b464c22
pending_status added to MONITOR_SERVERS
...
pending_status added to MONITOR_SERVERS
2014-06-27 14:04:02 +02:00
380f5b6bf3
Merge branch 'develop' into MAX-59
2014-06-27 13:58:12 +02:00
4f12e123c5
Removed SERVER parameter from dcb_call_foreach
...
Removed SERVER parameter from dcb_call_foreach
2014-06-27 13:51:40 +02:00
475e408551
remove tmporal files from debian dir
2014-06-27 14:45:55 +03:00
c2b20eab84
add debian files
2014-06-27 14:44:55 +03:00
fdcdc064b1
Added server pending states in monitor
...
server pending states are now saved and copied to server status before
monitor thread sleep
2014-06-27 13:38:35 +02:00
eee2ad7143
Merge branch 'develop' into MAX-90
...
Conflicts:
server/core/service.c
2014-06-27 12:15:30 +01:00
25d4f784bc
Implementation of server routing generic functionality and for readconnrouter
2014-06-27 12:07:47 +01:00
237bacd131
Merge branch 'develop' into MAX-59
2014-06-27 11:07:55 +02:00
de5d4fda8b
Merge of new user interface changes
2014-06-27 09:57:39 +01:00
c824e9fad6
Merge branch 'develop' into MAX-111
2014-06-27 09:52:00 +01:00
7cdef05710
Fix issue with OK being split across multiple reads
2014-06-27 09:27:43 +01:00
20637ee224
Removed unnecessary SERVER pointer from dcb.c:dcb_call_foreach(), changed declaration and call accordingly.
2014-06-27 10:54:11 +03:00
edf9f0c59c
Listed and described shortly max_slave_connections and server_options=slave_selection_criteria parameters.
2014-06-27 10:50:56 +03:00
c13275c0e7
merge from develop
...
merge from develop
2014-06-26 21:27:22 +02:00
52646a9942
Fix compile warning
...
Fix compile warning
2014-06-26 21:22:33 +02:00
a351a5eb09
fix compile warning
...
fix compile warning
2014-06-26 21:17:49 +02:00
1f77f37fbb
fix type in path in .spec
2014-06-26 21:16:43 +03:00
eb5912239a
Documentation for MaxAdmin - rewrite of CLI command guide
2014-06-26 17:23:33 +01:00
f246219beb
Fix compile errors and warnings
...
Fix compile errors and warnings
2014-06-26 18:20:33 +02:00
ace2550d93
Merge branch 'develop' into MAX-111
2014-06-26 16:52:57 +01:00
031294f655
Diagnostic update
2014-06-26 16:52:10 +01:00
f96b762478
User interface improvements
...
Addition of enable/disable heartbeat, enable/disable root, list monitors,
show monitors
Better filter diagnostic output
2014-06-26 16:46:19 +01:00
8808fd7e47
Some debug messages removed
...
Some debug messages removed
2014-06-26 17:18:53 +02:00
1dbb4b1780
removed duplicated routine code
...
removed duplicated routine code
2014-06-26 17:12:08 +02:00
1a33277f72
Merge from develop
...
Merge from develop
2014-06-26 17:08:21 +02:00
4d2e43a2d9
code cleanup and documentation
...
code cleanup and documentation
2014-06-26 16:56:21 +02:00
10ac2cb6e6
add /etc/init.d/maxscale to the package
2014-06-26 15:23:22 +03:00
d8ac0467de
Added comments for SHOW SLAVE STATUS
...
Added comments for SHOW SLAVE STATUS
2014-06-26 14:14:37 +02:00
dbf12f6183
Added new rules for Master selection
...
Added new rules for Master selection using replication tree
2014-06-25 18:38:33 +02:00
5a65bc2aaa
get_root_master routine available
...
get_root_master routine available
2014-06-25 17:19:14 +02:00
22827e7c8d
Merge pull request #6 from skysql/MAX-99
...
Max 99
2014-06-25 18:06:22 +03:00
1d1da398d4
Merge branch 'develop' into MAX-99
...
Conflicts:
server/modules/routing/readwritesplit/readwritesplit.c
2014-06-25 17:50:29 +03:00
dff18bf9bb
Necessary checks and macros for prepared statement support implementation.
2014-06-25 17:37:37 +03:00
7ff14e23a5
Support 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.
All executes are routed to master. If stmt type was recorded in prepare phase in rwsplit router, read-only stmts could be routed to slaves.
COM_STMT_PREPARE gets arbitrary number of response packets from backend database. Since statements are prepared in every backend server and only one multi-packet response can be replied to client, redundant multi-packet responses are discarded. This is done in router. Mechanisms from session command handling are utilized with little changes: router must identify when response consists of multiple packets so that it knows to calculate the number of packets in response and that it is able to discard correct number of packets.
Information to the reply-handling router is provided by backend protocol, which includes a ordered list of commands of commands sent to protocol-owning backend server. A command is stored to protocol struct in mysql_backend.c:gw_MySQLWrite_backend if the statement buffer's type has GWBUF_TYPE_SINGLE_STMT set in mysql_client.c:route_by_statement. GWBUF_TYPE_SINGLE_STATEMENT indicates that there is single statement in the buffer, as opposite to Read Connection router, which accepts streaming input from client.
2014-06-25 17:15:46 +03:00
2eafe15bca
Added master_host update in the loop
...
Added master_host update in the loop, returns the right server in case
of multiple servers with same replication depth
2014-06-25 15:51:29 +02:00
2d128de85f
Replaced MySQL command macros with enumerated type. Each command has prefix 'MYSQL_' otherwise they match with those listed in mariadb-5.5 mysql_com.h.
...
Added server command list structure which is included in MySQLProtocol. It holds command and number of response packets the command causes backend server to send as a response. Added set of functions related to protocol command and response packets counting etc.
2014-06-25 15:48:55 +03:00
d30ff534b9
In 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.
2014-06-25 15:37:44 +03:00
fa08a141e4
Fix to reload dbusers
...
Tidyup show service output
2014-06-25 13:01:32 +01:00
792ae454f4
Add support for #!../maxadmin scripts
...
Add the --help option
Add quoting for executing command with arguments that contain whitespace
2014-06-25 10:00:59 +01:00
c14700fcff
Added documentation to new routines
...
Added documentation to new routines
2014-06-25 10:21:30 +02:00
e0596b7d72
Merge branch 'develop' into MAX-65
2014-06-25 08:28:17 +01:00
65c42b93cf
If 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.
...
cloesSession was called in session.c:session_free if all DCBs had been removed their references to session. closeSession, however, is function which handles closing router. Router is responsible for closing all backend DCBs (=connections). Thus, calling sessionClose after all backend connections had been removed already is unnecessary and causes assertion traps.
Simply removed the call.
2014-06-24 21:59:42 +03:00
c30e270768
Removed 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.
2014-06-24 21:56:15 +03:00
442ac7fefb
Added 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.
2014-06-24 21:51:54 +03:00
