Commit Graph

4179 Commits

Author SHA1 Message Date
de593d0474 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-10 12:49:05 +02:00
9815fef590 Moved some routines at the end of the file
Moved some routines at the end of the file
2015-09-10 12:03:49 +02:00
9f01d0ec3f Fix type. 2015-09-10 10:54:33 +01:00
0ddabccd2f Documentation update
Documentation update
2015-09-09 15:35:24 +02:00
dd45a8f418 Updated documentation. 2015-09-09 16:23:07 +03:00
1bf8853046 Fix to MXS-339: https://mariadb.atlassian.net/browse/MXS-339
Renamed maxscale.cnf to maxscale.cnf.template
2015-09-09 13:21:54 +03:00
c7a5734e0c Added missing include to sharding_common.h 2015-09-09 13:02:18 +03:00
67f8520c38 Added missing include to sharding_common.h 2015-09-09 13:00:10 +03:00
8d0add5a1a Funcion names removed from maxbinlogcheck messages
Funcion names removed from maxbinlogcheck messages
2015-09-09 10:26:21 +02:00
6fe8082445 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-09 10:20:25 +02:00
b84dbd8d3f MXS-357: Possibility to turn off log message augmentation.
It's not always desireable to have the function name
appended to every logged line.
2015-09-09 10:59:22 +03:00
ed8d42300a Added MariaDB10 example
Added MariaDB10 example
2015-09-08 18:53:30 +02:00
114ea28aea Fix a couple of typos 2015-09-08 16:59:24 +01:00
9bfefa95ae maxbinlogcheck update
maxbinlogcheck update
2015-09-08 17:27:28 +02:00
5350a85e2b Fix to MXS-356: https://mariadb.atlassian.net/browse/MXS-356
Added configurable timeouts for the embedded MySQL connections.
2015-09-08 11:23:35 +03:00
41ea2849a4 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-08 10:01:37 +02:00
ee19fbd41b Documentation Update
Documentation Update
2015-09-08 09:48:34 +02:00
6f481c5d62 Documentation Update
Documentation Update
2015-09-08 09:45:59 +02:00
0f4a9ecdb8 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-07 18:22:17 +02:00
d6be8361fa Added Transaction Summary with events and bytes
Added Transaction Summary with events and bytes
2015-09-07 18:17:03 +02:00
8b278b0831 Transaction Summary in maxbinlogcheck
Transaction Summary in maxbinlogcheck
2015-09-07 16:38:43 +02:00
26ad339c6b Moved the section about maxadmin default user to the start of the document. 2015-09-07 17:28:40 +03:00
807adf5ed0 Merge from develop
Merge from develop
2015-09-07 14:49:50 +02:00
ad0becae48 Copyright set to 2015
Copyright set to 2015
2015-09-07 14:39:55 +02:00
e93f922e21 Cleaned up Ubuntu init scripts. 2015-09-07 14:03:30 +03:00
b8216aff4c More format fixes. 2015-09-07 13:48:27 +03:00
42fc2db65d Fixed formatting. 2015-09-07 13:19:40 +03:00
0779673403 MXS-228: Include file name and line numbers
This change does not log the file name and line numbers,
but the function name. Together with the commit information
that is logged in conjunction with a crash and that MaxScale
can tell, when invoked, that is enough to be able to pinpoint
the location where a logging was made. Furthermore, that is
a lot less intrusive and less confusing for an
end-user than filename + line.

This is just a temporary workaround; the logging mechanism
needs to get an overhaul:

- Separate severity and logging target.
- Take syslog severities into use.
- Simplify what needs to be done by developer.
- etc.
2015-09-07 12:32:32 +03:00
4653830104 Develop merge
Develop merge
2015-09-07 11:13:49 +02:00
197f656104 Added warnings to administrative commands
Added warnings to administrative commands
2015-09-07 11:09:55 +02:00
8cd3971d45 Fixed segfault in log manager when writing to multiple logfiles at once. 2015-09-07 11:18:43 +03:00
0febf23992 Removed LOGIF macros which prevented implicit initialization of the log manager. 2015-09-07 09:41:57 +03:00
160bbb70ee MXS-251: strerror
Replaces all calls to strerror with calls to strerror_r. The former
is non-thread safe while the latter is.
2015-09-05 15:52:13 +03:00
d69d0e2718 Small inprovements
Small inprovements
2015-09-04 22:44:38 +02:00
47b8e661c7 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-04 22:33:34 +02:00
f25b6389fc Support for SHOW WARNINGS
Support for SHOW WARNINGS
2015-09-04 22:30:02 +02:00
a9fd7926ac Removed unnecessary strcmp. 2015-09-04 19:34:18 +03:00
9a3510ab56 Added maxinfo and binlogrouter to the list of "internal routers". 2015-09-04 19:30:14 +03:00
697e108072 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-03 18:58:06 +02:00
b44b59c9cd Fixed Git use in CMake. 2015-09-03 19:38:56 +03:00
30cdda48c6 The datadir path is now used as the location where the process specific data directories are created. 2015-09-03 19:30:16 +03:00
2d0048ca06 Added support for SHOW GLOBAL VARIABLES
Added support for SHOW GLOBAL VARIABLES

An unknown variable results now has an empty result set instead of an
error
2015-09-03 18:03:10 +02:00
e497c40a9a Documentation update
Documentation update
2015-09-03 15:50:04 +02:00
45ccd1bbe5 Documentation update
Documentation update
2015-09-03 14:07:53 +02:00
51e6166423 Added RESET SLAVE
Added RESET SLAVE
2015-09-03 13:54:28 +02:00
860049a4a0 Incomplete transaction detection
Incomplete transaction detection
2015-09-03 12:32:23 +02:00
a8c02752c1 Documentation Update
Documentation Update
2015-09-03 12:30:17 +02:00
d45aa94d0d Documentation update
Documentation update
2015-09-03 12:28:02 +02:00
9174d6f90c Documentation update
Documentation
2015-09-03 12:22:38 +02:00
506bc422fb Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-03 10:08:55 +02:00