mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack
This commit is contained in:
commit
c45bd56dbd
20
CHANGELOG
20
CHANGELOG
|
@ -98,9 +98,18 @@ v2.8.0 (XXXX-XX-XX)
|
|||
of AQL queries
|
||||
|
||||
|
||||
v2.7.1 (XXXX-XX-XX)
|
||||
v2.7.2 (XXXX-XX-XX)
|
||||
-------------------
|
||||
|
||||
* fixed potentially invalid pointer access in shaper when the currently accessed
|
||||
document got re-located by the WAL collector at the very same time
|
||||
|
||||
|
||||
v2.7.1 (2015-11-07)
|
||||
-------------------
|
||||
|
||||
* switch to linenoise next generation
|
||||
|
||||
* exclude `_apps` collection from replication
|
||||
|
||||
The slave has its own `_apps` collection which it populates on server start.
|
||||
|
@ -643,7 +652,14 @@ v2.7.0-rc1 (2015-09-17)
|
|||
The "Applications" tab in the web interfaces has been renamed to "Services".
|
||||
|
||||
|
||||
v2.6.10 (XXXX-XX-XX)
|
||||
v2.6.11 (XXXX-XX-XX)
|
||||
--------------------
|
||||
|
||||
* fixed potentially invalid pointer access in shaper when the currently accessed
|
||||
document got re-located by the WAL collector at the very same time
|
||||
|
||||
|
||||
v2.6.10 (2015-11-10)
|
||||
--------------------
|
||||
|
||||
* disable replication appliers when starting in modes `--upgrade`, `--no-server`
|
||||
|
|
|
@ -212,12 +212,12 @@ struct TRI_doc_mptr_t {
|
|||
if (marker->_type == TRI_DOC_MARKER_KEY_DOCUMENT ||
|
||||
marker->_type == TRI_DOC_MARKER_KEY_EDGE) {
|
||||
auto offset = (reinterpret_cast<TRI_doc_document_key_marker_t const*>(marker))->_offsetJson;
|
||||
return static_cast<char const*>(_dataptr) + offset;
|
||||
return reinterpret_cast<char const*>(marker) + offset;
|
||||
}
|
||||
else if (marker->_type == TRI_WAL_MARKER_DOCUMENT ||
|
||||
marker->_type == TRI_WAL_MARKER_EDGE) {
|
||||
auto offset = (reinterpret_cast<triagens::wal::document_marker_t const*>(marker))->_offsetJson;
|
||||
return static_cast<char const*>(_dataptr) + offset;
|
||||
return reinterpret_cast<char const*>(marker) + offset;
|
||||
}
|
||||
|
||||
TRI_ASSERT(false);
|
||||
|
|
Loading…
Reference in New Issue