Commit Graph

4103 Commits

Author SHA1 Message Date
8a996029bc Merge branch 'MXS-35' into develop 2015-09-15 11:50:36 +03:00
bbc0116cd2 Moved the writing to and closing of the parent-child pipe to a separate function. 2015-09-15 10:52:37 +03:00
6817db3ae1 Added checks for empty values
Added checks for empty values
2015-09-15 09:48:04 +02:00
3f4acf4bc5 Added support for SHOW [GLOBAL] STATUS LIKE 'Uptime'
Added support for SHOW [GLOBAL] STATUS LIKE 'Uptime'
2015-09-15 09:17:52 +02:00
9cd9a6183b Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-14 21:13:14 +02:00
2829a8ce05 Added missing check for empty result set in binlogrouter. 2015-09-14 21:20:22 +03:00
e443351341 Fix to MXS-279: https://mariadb.atlassian.net/browse/MXS-279
Added NULL checks to block buffer initialization and checks for return values to functions that use it.
2015-09-14 16:29:14 +03:00
c2c27d7cca Merge from develop
Merge from develop
2015-09-14 09:49:33 +02:00
955974d06b Removed unused XID var
Removed unused XID var
2015-09-14 09:43:13 +02:00
5d1895561c Moved parts of dcb_read_SSL to separate functions. 2015-09-14 09:54:42 +03:00
c11c4733a4 Fixed wrong error message in dbusers 2015-09-12 05:43:32 +03:00
bb72b0c892 Fixed compiler warnings. 2015-09-12 04:46:47 +03:00
3b0b740e47 Fixed monitor scripts and added extra logging. 2015-09-11 18:49:20 +03:00
743fb5774b Improved logging. 2015-09-11 18:49:20 +03:00
3fe317f69b Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-11 15:22:17 +02:00
37f8148574 MXS-362: Enable/disable log augmentation
Log message augmentation (appending of function name) can now
be enabled or disabled via the configuration file and command
line.

By default, the augmentation is disabled.
2015-09-11 15:58:31 +03:00
535523f9d7 Added an upper limit to trace log message length for queries. 2015-09-11 14:29:58 +03:00
9fda8dcc26 Changed link order.
Did not link on Ubuntu.
2015-09-11 13:57:24 +03:00
96fdb5eb8d Fixed SSL write failures not being handled properly. 2015-09-10 18:36:59 +03:00
520198b870 Removed previous conflict line
Removed previous conflict line
2015-09-10 15:06:46 +02:00
b4637edd59 Added skygw_log_sync_all
Added skygw_log_sync_all
2015-09-10 15:01:01 +02:00
db93d868f8 Removed previous conflict line
Removed previous conflict line
2015-09-10 14:58:09 +02:00
c9fd82839b Merge from develop
Merge from develop
2015-09-10 14:53:50 +02:00
7d00a3670d Addition of maxbinlogcheck, a new utility in bin
Addition of maxbinlogcheck, a new utility in bin
2015-09-10 14:37:49 +02:00
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