|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
015cb890d4
|
Reduce complexity.
|
2015-07-10 14:56:01 +01:00 |
|
|
|
962f0db5ac
|
Merge branch 'release-1.2' into doc_changes
|
2015-07-10 14:18:45 +03:00 |
|
|
|
d97011c23e
|
Moved password encryption from configuration guide to getting started.
|
2015-07-10 14:18:20 +03:00 |
|
|
|
8fb2cf7064
|
Added missing link
|
2015-07-10 13:52:42 +03:00 |
|
|
|
af6e010ba1
|
Added missing namedserverfilter documentation.
|
2015-07-10 13:51:32 +03:00 |
|
|
|
a27289ca48
|
Fixed typo.
|
2015-07-10 13:23:08 +03:00 |
|
|
|
1ca1a25e23
|
Updated the getting started document.
|
2015-07-10 13:01:56 +03:00 |
|
|
|
7585adb228
|
Fixed links.
|
2015-07-09 23:52:31 +03:00 |
|
|
|
40d022b667
|
Added link to simple sharding tutorial.
|
2015-07-09 23:26:19 +03:00 |
|
|
|
8630e4284c
|
Fixed broken links.
|
2015-07-09 22:28:24 +03:00 |
|
|
|
b0e98bc420
|
Added template cnf file to /etc and renamed folders.
|
2015-07-09 14:41:23 +03:00 |
|
|
|
8376bbf3e6
|
Fix mismatch of int sizes; move calculation of maximum size of persistent pool to a better location.
|
2015-07-09 08:37:20 +01:00 |
|
|
|
bccf3d27d6
|
Correct name of function in debug message.
|
2015-07-08 16:22:09 +01:00 |
|
|
|
700576ac32
|
Add the DCB address to the "Not adding DCB to persistent pool" debug message.
|
2015-07-08 16:15:19 +01:00 |
|
|
|
ce879b65c2
|
Fix wrong debug message; add maxadmin info for actual max size of persistent pool.
|
2015-07-08 16:03:50 +01:00 |
|
|
|
ba417ef633
|
Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
server/core/dcb.c
|
2015-07-08 14:54:22 +01:00 |
|
|
|
3a69a87df1
|
Merge branch 'rwsplit_fixes' into release-1.2
|
2015-07-08 14:12:53 +03:00 |
|
|
|
10d690273d
|
Resolve compiler warnings
|
2015-07-08 11:35:41 +01:00 |
|
|
|
af2ce0f4f1
|
Fix to MXS-252: https://mariadb.atlassian.net/browse/MXS-252
Added missing buffer length parameter.
|
2015-07-08 12:45:48 +03:00 |
|
|
|
c154d2aecb
|
Added reference to hint document to rwsplit docs.
|
2015-07-08 12:42:48 +03:00 |
|
|
|
4cea1b68c0
|
Simplify logic in processing of zombies list, to bring more into line with develop branch and reduce conflicts when merged.
|
2015-07-08 09:26:21 +01:00 |
|
|
|
77db46359e
|
Change poll control failures to use SIGABRT rather than assert(false).
|
2015-07-08 08:52:19 +01:00 |
|
|
|
c50308fba5
|
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
|
2015-07-08 10:06:11 +03:00 |
|
|
|
27c4eddfac
|
Merge branch 'release-1.2' into develop
|
2015-07-08 10:05:43 +03:00 |
|
|
|
b73aedd0ca
|
Fixed debug log not working.
|
2015-07-08 10:05:15 +03:00 |
|
|
|
4276983d6f
|
Added more precise documentation for galeramon priority.
|
2015-07-07 21:40:30 +03:00 |
|
