2238 Commits

Author SHA1 Message Date
Markus Makela
fe20698fb0 Fixed a bug in httpd.c 2014-11-13 13:33:14 +02:00
Markus Makela
afb8859b43 Merge branch 'develop' into firewall 2014-11-13 09:50:02 +02:00
Markus Makela
59b587462a Fix to Coverity defects 72714 75940 75941 2014-11-13 09:09:11 +02:00
Markus Makela
aaa9bfd5c2 Fixes to Coverity defects 78241 78242 78243 78244 78245 2014-11-13 08:56:02 +02:00
Markus Makela
fc5c3943e8 Fixes to Coverity defects:
72643
72645
72655
72656
72657
72658
72664
72698
72712
2014-11-12 19:02:37 +02:00
Markus Makela
917d213c13 Fix to Coverity defect 73387 2014-11-12 18:09:10 +02:00
Markus Makela
2b11b53144 Fixes to Coverity defects 72681, 72683, 72691. 2014-11-12 17:25:49 +02:00
VilhoRaatikka
70acd60117 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-11-12 16:42:03 +02:00
VilhoRaatikka
4e405ebb8f Added logging to log rotation and to filter session setup. 2014-11-12 16:41:28 +02:00
MassimilianoPinto
e2930a4b9e Fix for wrong default value
Fix for wrong default value
2014-11-12 15:15:39 +01:00
VilhoRaatikka
8311d02f61 Removed unnecessary local variables for errno since it is thread safe. 2014-11-11 14:51:55 +02:00
Markus Makela
50a5a7892d Repurposed old code and deleted obsolete code. 2014-11-11 14:27:23 +02:00
VilhoRaatikka
0ea4dd63a9 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-11-11 14:25:49 +02:00
VilhoRaatikka
128d5e3f48 Addition to previous fix 2014-11-11 14:25:34 +02:00
Markus Makela
4a8f97d2e2 Merge branch 'develop' into firewall 2014-11-11 14:18:44 +02:00
Markus Makela
98a362b430 Fix to Coverity error 72685 2014-11-11 14:10:15 +02:00
VilhoRaatikka
061fa62d29 Fixes to Coverity issues 77197 (mysql_common.c, dcb.c, mysql_client.c, skygw_debug.h), 72654 (poll.c), 72756 (mysql_backend.c), 72744 (mysql_backend.c), 77197 (mysql_common.c), 72746 (mysql_common.c), 72676 (mysql_common.c), 72705 (readwritesplit.c), 72697 (readwritesplit.c), 72652 (skygw_debug.h) 2014-11-11 14:10:06 +02:00
Markus Makela
9cb2be9605 Fixes to Coverity erros 75748 and 76132. 2014-11-11 13:42:12 +02:00
MassimilianoPinto
badc45f457 Coverity fix 72709
Coverity fix 72709
2014-11-11 10:56:56 +01:00
MassimilianoPinto
bc43ead78d timeout options added to monitors
timeout options added to monitors
2014-11-11 08:46:56 +01:00
MassimilianoPinto
39b04682ea COM_CHANGE_USER honours charset change
COM_CHANGE_USER honours charset change
2014-11-10 17:06:14 +01:00
MassimilianoPinto
49d28bc1f3 MySQL connect: charset flag is stored
MySQL connect: charset flag is stored and passed to backend
2014-11-10 16:09:55 +01:00
VilhoRaatikka
704c69eb40 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-11-10 17:06:01 +02:00
VilhoRaatikka
24c1106abf Removed invalid assertion from readwritesplit.c 2014-11-10 17:05:40 +02:00
MassimilianoPinto
78ede89b3b Addition of setNetworkTimeout in galera mon
Addition of setNetworkTimeout in galera mon
2014-11-10 15:31:36 +01:00
MassimilianoPinto
68df1b9c99 Addition of timeout for connect,read,write
Addition of timeout for connect,read,write in mysql_mon.c
2014-11-10 15:13:26 +01:00
VilhoRaatikka
9a5168c3e8 Put errors ganerating code behind FAKE_CODE macro, which is not defined by default in any build. 2014-11-10 15:22:08 +02:00
Markus Makela
7f7cb0a982 Switched from CPU time to real time in connection test. 2014-11-10 14:30:56 +02:00
VilhoRaatikka
a3675e9098 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-11-10 14:18:43 +02:00
VilhoRaatikka
62270412cf readwritesplit.c: prevent switching the master during session. Added logging to cases where master has changed.
Moved DCB's member errhandle_called behing DEBUG flags to Release build. It shows if handleError is called for a DCB and makes it possible to avoid redundant calls.
2014-11-10 14:15:32 +02:00
VilhoRaatikka
3b07449daa Fix to bug #614, http://bugs.skysql.com/show_bug.cgi?id=614
Added protected state check to mysql_client.c, fixed locking in session.c
2014-11-10 14:07:51 +02:00
Markus Makela
e86b51865c Fixes to Coverity errors 72653, 72685, 72707, 73391, 73393, 73394, 73410 and 73414. 2014-11-10 13:51:21 +02:00
Markus Makela
c2c12d8b00 Added missing linker flags to connection test. 2014-11-10 13:48:03 +02:00
MassimilianoPinto
f466f86672 Added default NULL for users table
Added default NULL for users table
2014-11-10 11:10:32 +01:00
MassimilianoPinto
071e15048d Removed leak for service with more listeners
Removed leak for service with more listeners:

users are allocated once in service
2014-11-10 11:08:12 +01:00
Markus Makela
9accebdc37 Merge branch 'develop' into firewall 2014-11-10 09:08:39 +02:00
Markus Makela
37fa9668a9 Added a check for MySQL client libraries for the connection tests and re-enabled the tests. 2014-11-10 09:06:23 +02:00
Markus Makela
5490954e43 Disabled login tests. 2014-11-07 18:47:41 +02:00
Markus Makela
c62261710b Fixed wrong mysql libraries being used in the tests 2014-11-07 18:32:37 +02:00
MassimilianoPinto
62069f7ba9 Missing bracket
Missing bracket
2014-11-07 17:10:24 +01:00
MassimilianoPinto
55d13ab46c Merge branch 'MAX-316' into develop 2014-11-07 17:02:56 +01:00
MassimilianoPinto
39cc701b0d Branch update
Branch update
2014-11-07 16:59:01 +01:00
VilhoRaatikka
00245201bb Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-11-07 17:57:06 +02:00
VilhoRaatikka
44771dbc51 readwritesplit.c:handleError is meant to handle backend errors. Removed one call from mysql_client.c and only send error message to client instead.
Added checks to debug build to ensure that handleError is called before backend DCB is closed.
2014-11-07 17:55:05 +02:00
MassimilianoPinto
3b982ae820 Added monitor timeouts for connect/read/write
Added monitor timeouts for connect/read/write
2014-11-07 16:45:06 +01:00
Markus Makela
b8d059336a Merge branch 'testconnect' into develop 2014-11-07 17:11:32 +02:00
Markus Makela
813529b476 Added a test for the time it takes to login through MaxScale with various routers. 2014-11-07 17:05:21 +02:00
Mark Riddoch
89355c6579 Merge branch 'develop' of github.com:skysql/MaxScale into develop 2014-11-07 13:18:13 +00:00
Mark Riddoch
45005d9b35 Fix free of uninitialised pointers in case of failure. 2014-11-07 13:17:50 +00:00
Mark Riddoch
02039656df Merge branch 'develop' of github.com:skysql/MaxScale into develop
Conflicts:
	server/modules/filter/regexfilter.c
2014-11-07 13:16:15 +00:00