hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,218 Commits 1 Branch 0 Tags
001d2df96c1c00517d9fb53b67ae470ce555cd3a
Commit Graph

1318 Commits

Author SHA1 Message Date
Markus Makela
4da9045da4 Removed redundant function. 2015-08-28 12:54:38 +03:00
Markus Makela
94eb1b4eb1 Added service and monitor permission checks. 2015-08-28 12:51:37 +03:00
Markus Makela
0c552bab29 Fix to MXS-35: https://mariadb.atlassian.net/browse/MXS-35 
The parent process now correctly returns the value from the child process.
 2015-08-27 14:22:58 +03:00
MassimilianoPinto
23d24d935c Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-26 11:46:02 +02:00
Markus Makela
3e863863dd Fixes to Coverity defects. 2015-08-26 09:35:10 +03:00
Markus Makela
ab86b67bda Fixed missing include. 2015-08-25 21:23:55 +03:00
MassimilianoPinto
85d11436d7 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-25 16:10:43 +02:00
MassimilianoPinto
1c9b0665ee Use dcb_close() instead of dcb_free() 
Use dcb_close() instead of dcb_free()
 2015-08-25 16:08:29 +02:00
Markus Makela
79c77d3f01 Fixed compiler warnings. 2015-08-25 15:23:27 +03:00
Markus Makela
1658e3d704 Added more verbose error messages and fixed bugs. 2015-08-25 15:20:10 +03:00
Markus Makela
f58e7af94d Added a define for the PID file desciptor initial value. 2015-08-25 15:20:10 +03:00
Markus Makela
372403760c Cleaned up code. 2015-08-25 15:20:10 +03:00
Markus Makela
063c8f904a Fixed wrong file open mode. 2015-08-25 15:20:10 +03:00
Markus Makela
0a33174803 Added PID file locks and cleaned up code. 2015-08-25 15:20:10 +03:00
Markus Makela
1dd22a4d2c Cleaned up code and error messages. 2015-08-25 15:20:10 +03:00
Markus Makela
b1d6096fa8 Added a check for running MaxScale processes. 2015-08-25 15:20:10 +03:00
MassimilianoPinto
d6f5bdc067 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-24 10:20:45 +02:00
Martin Brampton
087c2fca46 Block out new test for the time being. 2015-08-23 10:09:42 +01:00
Martin Brampton
6b2d90fc50 Add check so DCB can't be added to poll list without a linked session; small safety improvement in session; tidying. 2015-08-23 09:34:26 +01:00
Martin Brampton
53c3cc4b41 Fix mistake; tidy format. 2015-08-22 19:14:40 +01:00
Markus Makela
7410b3dfbd Cleaned up code. 2015-08-21 18:13:45 +03:00
Markus Makela
d1bf6bb303 Merge branch 'develop' into dcb_code_revert 2015-08-20 12:06:14 +03:00
MassimilianoPinto
34bd94fbcd Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-20 10:09:32 +02:00
Martin Brampton
139d4829a9 Further refinement of poll_remove_dcb function to ensure proper delayed release of a DCB that may be in the poll list and should only be destroyed after all threads have completed any operations on it; add comments describing implementation limitations in the bitmask processing. 2015-08-20 06:58:05 +01:00
counterpoint
38f78c7239 Fix possible threading problem. 2015-08-19 17:23:49 +01:00
MassimilianoPinto
4f568fce85 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-19 10:00:59 +02:00
Markus Makela
4e5968ee15 Reverted changed which add a return value to dcb_log_write_failure 2015-08-18 13:12:59 +03:00
Markus Makela
98ab399e6e Changed sprintf calls to snprintf calls and fixed compiler warnings. 2015-08-18 10:50:48 +03:00
MassimilianoPinto
e65e2b3a84 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-17 12:12:16 +02:00
Markus Makela
b26b3eff6b Fixed possible NULL pointer dereference and out-of-bounds read in user hashtable comparison function. 2015-08-17 07:23:24 +03:00
Markus Makela
86ad570af8 Fix to MXS-310: https://mariadb.atlassian.net/browse/MXS-310 
The dumpable flag is now reset to true after the uid is changed.
 2015-08-16 18:15:16 +03:00
MassimilianoPinto
5743888494 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-12 09:35:01 +02:00
Markus Makela
d6b587ad59 Fixed bad directory names in config not causing MaxScale to exit. 2015-08-11 21:07:11 +03:00
MassimilianoPinto
1989b7eaa7 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-10 17:57:32 +02:00
Markus Makela
37ea3a6224 Fixed error on bad log directory. 2015-08-10 18:25:46 +03:00
Markus Makela
0abcf349ff Partial merge of MXS-70 2015-08-10 17:33:40 +03:00
MassimilianoPinto
53f24fb53a Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-10 09:55:45 +02:00
Markus Makela
bcb44ed70d Fixed PID file name. 2015-08-10 10:34:22 +03:00
MassimilianoPinto
9f9b63485a Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-07 21:20:32 +02:00
Markus Makela
710cfbd6c5 Fixed custom directory locations not working. 2015-08-07 19:22:26 +03:00
MassimilianoPinto
0239fb0650 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-07 14:48:43 +02:00
Markus Makela
ba32596603 Fixed MM monitor segfault on crash. 2015-08-07 14:00:55 +03:00
root
61c47375d5 Merge branch 'develop' into 1.2.1-binlog_router 
Conflicts:
	server/core/server.c
	server/include/server.h
	server/modules/include/blr.h
	server/modules/routing/binlog/blr.c
	server/modules/routing/binlog/blr_file.c
	server/modules/routing/binlog/blr_master.c
	server/modules/routing/binlog/blr_slave.c
 2015-08-04 07:59:44 -04:00
Markus Makela
a6ae1cbc22 Fixed session timeouts using func.hangup instead of dcb_close. 2015-08-03 08:34:25 +03:00
counterpoint
6a92a419ff Remove function declaration - moved to header. Implement spin_reporter in server.c, required for correct compilation when SPINLOCK_PROFILE is defined true. 2015-07-27 09:01:20 +01:00
Markus Makela
66445c838b Fixed missing include 2015-07-24 16:48:45 +03:00
Markus Makela
e5502271ae Merge branch 'sigchld_handler' into develop 2015-07-24 13:42:52 +03:00
Markus Makela
e252402edf Fixed config failure when listener only has a socket and no port. 2015-07-24 12:47:28 +03:00
Markus Makela
adee076242 Merge branch 'develop' into sigchld_handler 2015-07-24 12:25:26 +03:00
Markus Makela
dcd82d3a33 Fixed errors and added logging. 2015-07-24 12:19:22 +03:00