Commit Graph

2008 Commits

Author SHA1 Message Date
78a02f5297 Compile warning fixed in galera_mon.c
Compile warning fixed in galera_mon.c
2014-05-28 09:39:33 +02:00
a45e009dfe Merge branch 'feature-MAX-58' into develop
Merge branch 'feature-MAX-58' into develop
2014-05-28 09:31:29 +02:00
70115d35c9 Fix to bug #438 http://bugs.skysql.com/show_bug.cgi?id=438
Fixed some compiler warnings, added header includes, return values etc.
2014-05-27 17:07:41 +03:00
97bb1638ad Delete swp file 2014-05-27 12:17:09 +01:00
d12ed592a0 Removed a duplicate code added by merge
A code duplication occurred in a switch statement during the merge of the cenh branch
2014-05-27 09:44:17 +01:00
a6d6938367 Merge branch 'feature-MAX-98' into develop 2014-05-26 14:17:30 +02:00
b54ca8e87f Default values for MONITOR_INTERVAL
Default values for MONITOR_INTERVAL
2014-05-26 14:16:56 +02:00
0e510cfa4a Default values for MONITOR_INTERVAL
Default values for MONITOR_INTERVAL
2014-05-26 14:15:51 +02:00
330c0f6bf7 MONITOR_INTERVAL default added
MONITOR_INTERVAL default added
2014-05-26 14:13:01 +02:00
b17744fd46 Monitor Version Update
Monitor Version Update
2014-05-26 14:07:04 +02:00
040e7158fc Merge branch 'feature-MAX-98' into develop 2014-05-26 14:05:47 +02:00
60e06080ff Monitor version update
Monitor version update
2014-05-26 14:05:29 +02:00
046e734d40 Merge branch 'feature-MAX-98' into develop 2014-05-26 13:58:18 +02:00
9b46bc063d Compile error
Compile error
2014-05-26 13:57:45 +02:00
375121aec7 Merge from feature-MAX-98
Merge from feature-MAX-98
2014-05-26 12:50:29 +02:00
c23773c977 Removed binlog path
Removed binlog path
2014-05-26 12:40:56 +02:00
378d00983d merge from branch 'cenh'
merge from branch ‘cenh’
2014-05-26 12:15:34 +02:00
7b24841af6 Updated
Upated
2014-05-26 11:57:16 +02:00
f0f6413b39 Update
Update
2014-05-26 11:17:57 +02:00
d732a397aa struct router_client_session update
struct router_client_session update
2014-05-26 10:56:51 +02:00
82b7b1064d Removed extra space
Removed extra space
2014-05-26 10:45:35 +02:00
bf00ca8aba GaleraHA support - R/W Splitting with Galera
GaleraHA support - R/W Splitting with Galera
2014-05-26 10:29:34 +02:00
cde204db47 MariaDB 10 Replication support
MariaDB 10 Replication support
2014-05-26 10:09:01 +02:00
a819887b07 Added logging to place where authentication with backend fails and the reason is unknown. 2014-05-24 00:07:40 +03:00
698e63eaf4 Changed bash-related comparison equality operator '==' to generic '=' 2014-05-23 22:08:57 +03:00
a6eb7bd743 Added space character between '--' and comment text in sql scripts. 2014-05-23 22:07:32 +03:00
78c5c407bd Fixed conflict 2014-05-23 16:43:11 +01:00
45d5d521b8 Merge branch 'blr' into cenh
Conflicts:
	Documentation/MaxScale Configuration And Usage Scenarios.pdf
	server/core/config.c
	server/core/dcb.c
	server/core/service.c
	server/modules/routing/Makefile
	server/modules/routing/debugcmd.c
	server/modules/routing/readwritesplit/readwritesplit.c
	server/modules/routing/readwritesplit/test/rwsplit.sh
2014-05-23 16:39:39 +01:00
7fe50a311f Addition of developer and user modes to debugcli
In order to be able to protect the interface so that mistyped argument
do not endanger MaxScale yet still allow the developer access a router
option has been added that gives the debugcli two modes.
2014-05-23 13:29:58 +01:00
23a9759fca Fixed a couple of memory leaks 2014-05-23 09:08:02 +01:00
3b984d2773 Improve quoting mechanism is debug interface
Introduce the use of \ and allow the quotes to appear at any point
within the string, not just the beginning and end of words.
2014-05-22 15:24:07 +01:00
837d15dc33 Fix valgrind issue with saved master responses 2014-05-22 15:07:46 +01:00
23956d737b Changed bash-related comparison equality operator '==' to generic '=' 2014-05-21 22:10:40 +03:00
77299fea2e Added space character between '--' and comment text in sql scripts. 2014-05-21 22:05:13 +03:00
c1d39999ff Improvements to debug interface & blr updates 2014-05-21 17:25:21 +01:00
c28052d5a4 Manual merge from master to develop. Incliding fix for bug #425 http://bugs.skysql.com/show_bug.cgi?id=425 2014-05-21 15:41:39 +03:00
e6cdfa4dd4 Removed another invalid assert. It is allowed to read less or more than content of the first arrived packet. 2014-05-21 09:22:36 +03:00
af84b9560a Merge branch 'bug425' of https://github.com/skysql/MaxScale into bug425 2014-05-20 22:42:07 +03:00
ebcf4afa52 Invalid invariant in assert caused MaxScale to trap if more bytes were read than the first mysql packet contained according to the mysql packet length field. Since it is typical that session updates and mysql packets come in same transfer this check fails in correct cases as well.
Removed assertion.
2014-05-20 22:34:43 +03:00
8b3ea0c4d9 Added ability to use the service name in a show service command 2014-05-19 18:20:03 +01:00
d52f761b2d Fix missing GWBUF queue 2014-05-19 15:18:09 +01:00
6d83e48b87 Merge 2014-05-19 13:47:15 +01:00
9777e83a5a Merge branch 'master' into blr 2014-05-19 13:46:47 +01:00
854d7d7c68 Updated debug command plugin. 2014-05-19 12:31:56 +01:00
5c39682e40 Added message printing telling what file provided the module which was loaded. 2014-05-17 23:10:03 +02:00
29d247319d Fixed issue with bin log event straddling buffers 2014-05-17 07:25:03 +01:00
bb364f531b Bug #425, http://bugs.skysql.com/show_bug.cgi?id=425
mysqlk_client.c now assumes that mysql packets may arrive in separate pieces.
gw_read_client_event reads client data, and if packet is incomplete it is added to new dcb->dcb_readqueue. When next packet is combined with data in readqueue.

mysql_common.c:gw_MySQL_get_next_packet can now return mysql packet from read buffer although it would span multiple gwbuf buffers.
2014-05-16 17:01:10 +02:00
1d08b0100f Initial binlog prototype
Supports pulling binlogs from the master, caching to a local file and relaying to a slave.

Only tested with a single slave and a single MaxScale thread.
2014-05-13 16:06:05 +01:00
c5ec3cbc57 Added new criteria for slave selection: LEAST_ROUTER_CONNECTIONS which causes the servers having least connections from same router to become chosen.
Added function pointer array which is indexed by enumerated selection criterias.
Selection criteria can now be switched by modifying config file and reloading it.
2014-05-12 17:03:22 +03:00
b7ae1c1784 Added router_option slave_selection_criteria=[LEAST_GLOBAL_CONNECTIONS(default)|LEAST_BEHIND_MASTER] to readwritesplit section.
The option is reloadable in the same way as max_slave_connections parameter. Option value determines which sort function is called before to sort backend server pointers before selecting them and establishing connections to backends.
2014-05-11 23:59:16 +03:00