Commit Graph

3810 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
3a06710056 Merged 'master' into develop. 2015-07-15 17:21:24 +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
4bb776f4e5 Merge branch 'release-1.2'
Conflicts:
	Documentation/Documentation-Contents.md
2015-07-15 16:34:27 +03:00
0a43b9eebf Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-07-15 15:00:35 +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
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
78eab19c62 Fixed compiler warnings. 2015-07-14 17:13:09 +03:00
3992f262ca Fixed Coverity defects 2015-07-14 16:17:50 +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
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
03031eea71 Merge branch 'release-1.2' into develop 2015-07-13 19:22:49 +03:00
d799a2d676 Fixed title. 2015-07-13 19:22:06 +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
0134fdc397 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
2453b808cf Merge branch 'doc_changes' into release-1.2 2015-07-13 15:17:42 +03:00
6c5c88ccf0 Merge branch 'priority_galeramon' into develop 2015-07-13 14:39:33 +03:00
19fe7127d5 Added galeramon server priorities. 2015-07-13 14:39:04 +03:00
93e557d8be Merge branch 'release-1.2' into MXS-230 2015-07-13 13:27:11 +03:00
584ad321ff Fixed possible crash. 2015-07-13 13:22:19 +03:00
ef6728344e Fixed failures to close cloned DCBs. 2015-07-13 13:11:43 +03:00
056ad50458 Merge branch 'release-1.2' into MXS-230 2015-07-13 13:08:37 +03:00
53a2dfcea7 Merge branch 'release-1.2' of https://github.com/mariadb-corporation/MaxScale into release-1.2
Conflicts:
	cmake/package_rpm.cmake
2015-07-13 13:04:06 +03:00
38b5166543 fixed double definition of CMake variables. 2015-07-13 13:03:15 +03:00
8400cbf436 Merge pull request #87 from mariadb-corporation/MXS-261
Add architecture and distro name to package name
2015-07-13 12:58:10 +03:00
9728ec6169 Addition of new mariadb10 events to diagnostics()
Addition of new mariadb10 events to diagnostics()
2015-07-13 12:54:04 +03:00
05fad56853 Fixed DEB packages not being build if both rpmbuild and dpkg-buildpackage are found. 2015-07-13 12:50:48 +03:00
00b4d8edf5 Tidy up indentation, add folds around logging, in dcb_read. 2015-07-13 09:56:29 +01:00
ff3c9b94cb Add architecture and distro name to package name 2015-07-13 09:11:38 +03:00
ed5ee2d586 Updated documents. 2015-07-12 22:59:19 +03:00
a9d30b07b3 Fixed MXS-258: https://mariadb.atlassian.net/browse/MXS-258 2015-07-12 22:34:28 +03:00
206f93e3ec Fixed missing return values. 2015-07-11 19:02:01 +03:00
e03dcc07c3 Enabled C99 compiler options 2015-07-11 17:13:00 +03:00
6497350ab7 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c
2015-07-11 17:12:48 +03:00
a6b35af9f6 Fixed release note titles. 2015-07-10 22:23:10 +03:00
f095ec353c Fixed config file being installed into /usr/etc instead of /etc. 2015-07-10 21:31:33 +03:00
2fe6d837fc Added null checks to hashtable functions and fixed possible crash with reload users. 2015-07-10 20:38:10 +03:00
ce0d9684d4 A few more clarifications, I hope. 2015-07-10 17:00:48 +01:00
4f5de063eb Merged dcb_read and dcb_read_n into a single function (dcb_read with an extra parameter). 2015-07-10 15:12:22 +01:00