Branch: refs/heads/master
  Home:   https://github.com/tarantool/tarantool
  Commit: da39fddfe6e2e39fcb87be761066ec5dd5812c5e
      
https://github.com/tarantool/tarantool/commit/da39fddfe6e2e39fcb87be761066ec5dd5812c5e
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M src/box/tree_index.cc

  Log Message:
  -----------
  Fix memory corruption in tree index during recovery from snapsht.

When tree.max_size is 0, tree.max_size * 2 is also 0.


  Commit: d8d3956475a5461904ef4ba9346904505bf4a8eb
      
https://github.com/tarantool/tarantool/commit/d8d3956475a5461904ef4ba9346904505bf4a8eb
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Log Message:
  -----------
  Merge branch 'stable'

Conflicts:
        src/box/tree_index.cc


  Commit: aaeef3c2befe6fd96012e490d9f65bfe15ededb5
      
https://github.com/tarantool/tarantool/commit/aaeef3c2befe6fd96012e490d9f65bfe15ededb5
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M src/box/tree_index.cc
    M third_party/sptree.h

  Log Message:
  -----------
  Fix a memory corruption when loading from snapshot.

Implementation of TreeIndex::reserve() had a bug when
tree.members weren't allocated while buildNext was already
using them.

Remove sptree_index_node magic and simplify sptree iterators.
                       </kostja>


Compare: 
https://github.com/tarantool/tarantool/compare/93d3ac6bc60b...aaeef3c2befe
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help   : https://help.launchpad.net/ListHelp

Reply via email to