Commit Graph

5586 Commits

Author SHA1 Message Date
af703f3ef4 fixed default log directory. 2015-07-16 05:43:25 +03:00
7c8a3e287f Merge branch 'master' into develop 2015-07-16 05:40:20 +03:00
0e5ee7c861 Fixed log manager. 2015-07-16 05:39:31 +03:00
ec4868a252 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-07-15 17:40:36 +03:00
73a388ea0b Merged 'master' into develop. 2015-07-15 17:21:24 +03:00
3a06710056 Merged 'master' into develop. 2015-07-15 17:21:24 +03:00
21a6d63bc0 Fixed broken link. 2015-07-15 17:17:47 +03:00
028159dffc Fixed broken link. 2015-07-15 17:17:47 +03:00
d4bc710d3e Fix mistake in dcb_close. 2015-07-15 15:15:28 +01:00
feeb4c590b Merge branch 'release-1.2'
Conflicts:
	Documentation/Documentation-Contents.md
2015-07-15 16:34:27 +03:00
4bb776f4e5 Merge branch 'release-1.2'
Conflicts:
	Documentation/Documentation-Contents.md
2015-07-15 16:34:27 +03:00
c51950ed09 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-07-15 15:00:35 +03:00
0a43b9eebf Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-07-15 15:00:35 +03:00
b03d6fcfd8 Merge branch 'release-1.2' into develop 2015-07-15 11:38:27 +03:00
b756690123 Merge branch 'release-1.2' into develop 2015-07-15 11:38:27 +03:00
124ad82de4 Small fix to readwritesplit session command handling. 2015-07-15 11:02:59 +03:00
1e5253768c Add blank line to start of Document Contents (link otherwise not rendered correctly by web site); move upgrade documents into their own directory; modify poll.c to fix problem relating to cloned DCBs. 2015-07-15 08:35:50 +01:00
260f829046 Add blank line to start of Document Contents (link otherwise not rendered correctly by web site); move upgrade documents into their own directory; modify poll.c to fix problem relating to cloned DCBs. 2015-07-15 08:35:50 +01:00
f22e2ec87b Added Connecting state in Slave_IO_Running
Added ‘Connecting’ state in Slave_IO_Running field of SHOW SLAVE STATUS
2015-07-15 09:18:55 +02:00
7b9d54d1d4 Removed MASTER_PASSWORD from logs
Removed MASTER_PASSWORD from logs
2015-07-14 17:32:42 +02:00
78eab19c62 Fixed compiler warnings. 2015-07-14 17:13:09 +03:00
3992f262ca Fixed Coverity defects 2015-07-14 16:17:50 +03:00
39cad90d67 Merge branch 'release-1.2' into MXS-230 2015-07-14 13:10:57 +03:00
ad369f61c6 Merge branch 'release-1.2' into MXS-230 2015-07-14 13:10:57 +03:00
96edaca90c Disabled C99. 2015-07-14 12:14:01 +03:00
40f4d8ee8f Revert "converted inline functions to normal functions."
This reverts commit b592e226e2c56b4b80215cdc37459e5e79beeb21.
2015-07-14 12:10:41 +03:00
b592e226e2 converted inline functions to normal functions. 2015-07-14 12:05:56 +03:00
df17527527 Fixed wrong message parameter
Fixed wrong message parameter
2015-07-13 19:28:32 +02:00
37fd2b6e87 Added chmod 600 for master.ini
Added chmod 600 for master.ini
2015-07-13 19:00:22 +02:00
3f273fd04a Merge branch 'release-1.2' into schemarouter_refresh 2015-07-13 19:37:00 +03:00
6f3da222fd Merge branch 'release-1.2' into schemarouter_refresh 2015-07-13 19:37:00 +03:00
a1801237a8 Fixed error messages being printed for existing directories. 2015-07-13 19:35:38 +03:00
aa92b31ef1 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-07-13 19:23:05 +03:00
8f8c901396 Merge branch 'release-1.2' into develop 2015-07-13 19:22:49 +03:00
03031eea71 Merge branch 'release-1.2' into develop 2015-07-13 19:22:49 +03:00
8fb5c7c443 Fixed title. 2015-07-13 19:22:06 +03:00
d799a2d676 Fixed title. 2015-07-13 19:22:06 +03:00
9480c01b96 New log messages for dbusers loading failure
New log messages for dbusers loading failure
2015-07-13 18:12:34 +02:00
e84f02db92 Merge branch 'release-1.2' into schemarouter_refresh 2015-07-13 19:10:05 +03:00
e146b2d632 Merge branch 'release-1.2' into schemarouter_refresh 2015-07-13 19:10:05 +03:00
3ddbe47f8b Minor tidy up, including removing obsolete MUTEX_BLOCK. 2015-07-13 14:32:54 +01:00
15d4624643 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
0134fdc397 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
0601d5e555 Merge branch 'doc_changes' into release-1.2 2015-07-13 15:17:42 +03:00
2453b808cf Merge branch 'doc_changes' into release-1.2 2015-07-13 15:17:42 +03:00
ffdd63ed66 Merge branch 'priority_galeramon' into develop 2015-07-13 14:39:33 +03:00
6c5c88ccf0 Merge branch 'priority_galeramon' into develop 2015-07-13 14:39:33 +03:00
40839a2f9b Added galeramon server priorities. 2015-07-13 14:39:04 +03:00
19fe7127d5 Added galeramon server priorities. 2015-07-13 14:39:04 +03:00
a16d4c46d6 Changed default master port to 3306
Changed default master port to 3306
2015-07-13 12:44:03 +02:00