Merge branch 'stable'
Conflicts: include/palloc.h src/box/box_lua.cc src/lua/init.cc test/wal/lua.test This commit also converts Lua bindings for MsgPack to C++ because they requires tbuf and region guard.
Showing
- include/lib/small/region.h 16 additions, 1 deletioninclude/lib/small/region.h
- include/lua/msgpack.h 13 additions, 12 deletionsinclude/lua/msgpack.h
- include/tbuf.h 1 addition, 2 deletionsinclude/tbuf.h
- src/CMakeLists.txt 1 addition, 1 deletionsrc/CMakeLists.txt
- src/box/box_lua.cc 94 additions, 71 deletionssrc/box/box_lua.cc
- src/box/tuple.h 2 additions, 2 deletionssrc/box/tuple.h
- src/box/tuple_convert.cc 4 additions, 2 deletionssrc/box/tuple_convert.cc
- src/lua/init.cc 2 additions, 0 deletionssrc/lua/init.cc
- src/lua/msgpack.cc 78 additions, 52 deletionssrc/lua/msgpack.cc
- test/wal/lua.result 35 additions, 0 deletionstest/wal/lua.result
- test/wal/lua.test.lua 27 additions, 0 deletionstest/wal/lua.test.lua
Loading
Please register or sign in to comment