Branch: refs/heads/lua-ffi
Home: https://github.com/mailru/tarantool
Commit: 2e359b0a6b67060def1a780837f24e5cfcdbdfee
https://github.com/mailru/tarantool/commit/2e359b0a6b67060def1a780837f24e5cfcdbdfee
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M CMakeLists.txt
A cmake/BuildSQL.cmake
M include/config.h.cmake
M src/CMakeLists.txt
M src/box/CMakeLists.txt
M src/box/box_lua.m
A src/box/lua/sql.lua
M src/lua/init.m
A src/lua/lua_pg.h
A src/lua/lua_sql.h
A src/lua/lua_sql.m
A src/lua/pg.m
A test/box/net_sql.result
A test/box/net_sql.test
Log Message:
-----------
Prototype for Pg driver
Commit: 8a0c95b00021e882782e660f1fd533a279accaac
https://github.com/mailru/tarantool/commit/8a0c95b00021e882782e660f1fd533a279accaac
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M CMakeLists.txt
M connector/c/include/tp.h
M doc/user/configuration-reference.xml
M doc/user/stored-procedures.xml
M doc/user/target.db
M include/config.h.cmake
M src/box/box_lua.m
M src/lua/init.m
M test/box/lua.result
M test/box/lua.test
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool into sql
Commit: d1701d492593179452fb742a98e3f85c73fc1c16
https://github.com/mailru/tarantool/commit/d1701d492593179452fb742a98e3f85c73fc1c16
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-05 (Wed, 05 Jun 2013)
Changed paths:
M cmake/BuildSQL.cmake
A cmake/FindMySQL.cmake
M src/box/lua/sql.lua
M src/lua/pg.m
M test/box/net_sql.result
M test/box/net_sql.test
Log Message:
-----------
Postgresql driver is ready (at first step)
Commit: 243c99623154baccf733ebf7d050e84be87b8c58
https://github.com/mailru/tarantool/commit/243c99623154baccf733ebf7d050e84be87b8c58
Author: Dmitry Simonenko <[email protected]>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
M connector/c/include/tp.h
M test/connector_c/tp.c
M test/connector_c/tp.result
Log Message:
-----------
tp.h: fix buffer allocation supporting any writer
https://github.com/mailru/tarantool/issues/20
Commit: ea7ae2b2e540c89c8719659555fa751ce1e601be
https://github.com/mailru/tarantool/commit/ea7ae2b2e540c89c8719659555fa751ce1e601be
Author: Dmitry Simonenko <[email protected]>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
M connector/c/include/tp.h
Log Message:
-----------
tp.h: tp_select example correction.
Commit: 8ca4f1cf15d6f19f1ab031a7e5df5fcd93ab74b2
https://github.com/mailru/tarantool/commit/8ca4f1cf15d6f19f1ab031a7e5df5fcd93ab74b2
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
M src/CMakeLists.txt
A src/lua/lua_mysql.h
M src/lua/lua_sql.m
A src/lua/mysql.m
M src/lua/pg.m
M test/box/net_sql.test
Log Message:
-----------
MySQL driver pre-alpha
Commit: c8a578b9871b86d4230ae2efabc06ec96768789e
https://github.com/mailru/tarantool/commit/c8a578b9871b86d4230ae2efabc06ec96768789e
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
M .gitignore
M .gitmodules
M CMakeLists.txt
M README.CentOS
M README.md
M cfg/warning.c
M cfg/warning.h
M client/tarantool_checksum/tc_space.c
R cmake/BuildLibOBJC.cmake
M cmake/compiler.cmake
M cmake/luajit.cmake
M cmake/package.cmake
A cmake/rpm.cmake
R cmake/rpm_post_install.sh
M connector/c/include/tp.h
M connector/c/tnt/CMakeLists.txt
M connector/c/tntnet/CMakeLists.txt
M connector/c/tntrpl/CMakeLists.txt
M connector/c/tntsql/CMakeLists.txt
M doc/developer/CMakeLists.txt
M doc/man/CMakeLists.txt
M doc/user/CMakeLists.txt
M doc/user/tutorial.xml
M extra/CMakeLists.txt
A extra/rpm.spec.in
R extra/tarantool.spec.in
M include/assoc.h
M include/box/box.h
M include/crc32.h
M include/errinj.h
M include/exception.h
M include/fiber.h
M include/fio.h
M include/iobuf.h
M include/lib/bit/bit.h
M include/lib/bitset/bitset.h
M include/lib/bitset/expr.h
M include/lib/bitset/index.h
M include/lib/bitset/iterator.h
M include/mhash.h
M include/object.h
M include/palloc.h
M include/pickle.h
M include/recovery.h
M include/replication.h
M include/rlist.h
M include/rope.h
M include/say.h
A include/scoped_guard.h
M include/sio.h
M include/stat.h
M include/tarantool.h
M include/tbuf.h
M include/util.h
M src/CMakeLists.txt
A src/admin.cc
R src/admin.m
M src/admin.rl
A src/assoc.cc
R src/assoc.m
M src/box/CMakeLists.txt
A src/box/bitset_index.cc
M src/box/bitset_index.h
R src/box/bitset_index.m
A src/box/box.cc
R src/box/box.m
A src/box/box_lua.cc
R src/box/box_lua.m
A src/box/box_lua_space.cc
R src/box/box_lua_space.m
A src/box/hash_index.cc
M src/box/hash_index.h
R src/box/hash_index.m
A src/box/index.cc
M src/box/index.h
R src/box/index.m
A src/box/port.cc
R src/box/port.m
A src/box/request.cc
R src/box/request.m
A src/box/space.cc
M src/box/space.h
R src/box/space.m
A src/box/tree_index.cc
M src/box/tree_index.h
R src/box/tree_index.m
A src/box/tuple.cc
R src/box/tuple.m
A src/box/txn.cc
R src/box/txn.m
A src/coeio.cc
R src/coeio.m
A src/coio.cc
R src/coio.m
A src/coio_buf.cc
R src/coio_buf.m
A src/coro.cc
R src/coro.m
A src/cpu_feature.c
R src/cpu_feature.m
A src/errinj.cc
R src/errinj.m
A src/evio.cc
R src/evio.m
A src/exception.cc
R src/exception.m
A src/fiber.cc
R src/fiber.m
A src/iobuf.cc
R src/iobuf.m
A src/ipc.cc
R src/ipc.m
A src/iproto.cc
R src/iproto.m
M src/lib/bit/CMakeLists.txt
M src/lib/bit/bit.c
M src/lib/bitset/index.c
M src/lib/bitset/page.h
A src/log_io.cc
R src/log_io.m
A src/lua/cjson.cc
R src/lua/cjson.m
A src/lua/info.cc
R src/lua/info.m
A src/lua/init.cc
R src/lua/init.m
A src/lua/lua_ipc.cc
R src/lua/lua_ipc.m
A src/lua/lua_socket.cc
R src/lua/lua_socket.m
A src/lua/session.cc
R src/lua/session.m
A src/lua/slab.cc
R src/lua/slab.m
A src/lua/stat.cc
R src/lua/stat.m
A src/lua/uuid.cc
R src/lua/uuid.m
A src/memcached-grammar.cc
R src/memcached-grammar.m
M src/memcached-grammar.rl
A src/memcached.cc
R src/memcached.m
A src/object.cc
R src/object.m
A src/opts.c
A src/palloc.cc
R src/palloc.m
A src/pickle.cc
R src/pickle.m
A src/recovery.cc
R src/recovery.m
A src/replica.cc
R src/replica.m
A src/replication.cc
R src/replication.m
A src/salloc.cc
R src/salloc.m
A src/say.cc
R src/say.m
A src/session.cc
R src/session.m
A src/sio.cc
R src/sio.m
A src/stat.cc
R src/stat.m
A src/tarantool.cc
R src/tarantool.m
A src/tbuf.c
R src/tbuf.m
A src/trace.c
R src/trace.m
A src/util.c
R src/util.m
M test/CMakeLists.txt
M test/box/args.result
M test/box/net.box.result
M test/box/net.box.test
M test/connector_c/tp.c
M test/connector_c/tp.result
M test/unit/CMakeLists.txt
R test/unit/objc_catchcxx.m
R test/unit/objc_catchcxx.result
R test/unit/objc_catchcxx.test
R test/unit/objc_finally.m
R test/unit/objc_finally.result
R test/unit/objc_finally.test
M third_party/README
R third_party/libobjc/ANNOUNCE
R third_party/libobjc/ANNOUNCE.1.0
R third_party/libobjc/ANNOUNCE.1.1
R third_party/libobjc/ANNOUNCE.1.2
R third_party/libobjc/ANNOUNCE.1.3
R third_party/libobjc/ANNOUNCE.1.4
R third_party/libobjc/ANNOUNCE.1.5
R third_party/libobjc/ANNOUNCE.1.6
R third_party/libobjc/ANNOUNCE.1.6.1
R third_party/libobjc/API
R third_party/libobjc/COPYING
R third_party/libobjc/Makefile
R third_party/libobjc/NSBlocks.m
R third_party/libobjc/Protocol2.m
R third_party/libobjc/README
R third_party/libobjc/abi_version.c
R third_party/libobjc/alias.h
R third_party/libobjc/alias_table.c
R third_party/libobjc/arc.m
R third_party/libobjc/associate.m
R third_party/libobjc/block_to_imp.c
R third_party/libobjc/block_trampolines.S
R third_party/libobjc/blocks_runtime.h
R third_party/libobjc/blocks_runtime.m
R third_party/libobjc/buffer.h
R third_party/libobjc/build_opts.sh
R third_party/libobjc/caps.c
R third_party/libobjc/category.h
R third_party/libobjc/category_loader.c
R third_party/libobjc/class.h
R third_party/libobjc/class_table.c
R third_party/libobjc/constant_string.h
R third_party/libobjc/dtable.c
R third_party/libobjc/dtable.h
R third_party/libobjc/dwarf_eh.h
R third_party/libobjc/eh_personality.c
R third_party/libobjc/encoding2.c
R third_party/libobjc/gc_boehm.c
R third_party/libobjc/gc_none.c
R third_party/libobjc/gc_ops.h
R third_party/libobjc/hash_table.c
R third_party/libobjc/hash_table.h
R third_party/libobjc/hooks.c
R third_party/libobjc/ivar.c
R third_party/libobjc/ivar.h
R third_party/libobjc/legacy_malloc.c
R third_party/libobjc/loader.c
R third_party/libobjc/loader.h
R third_party/libobjc/lock.h
R third_party/libobjc/method_list.h
R third_party/libobjc/module.h
R third_party/libobjc/mutation.m
R third_party/libobjc/nsobject.h
R third_party/libobjc/objc/Availability.h
R third_party/libobjc/objc/Object.h
R third_party/libobjc/objc/Protocol.h
R third_party/libobjc/objc/blocks_private.h
R third_party/libobjc/objc/blocks_runtime.h
R third_party/libobjc/objc/capabilities.h
R third_party/libobjc/objc/developer.h
R third_party/libobjc/objc/encoding.h
R third_party/libobjc/objc/hooks.h
R third_party/libobjc/objc/message.h
R third_party/libobjc/objc/objc-api.h
R third_party/libobjc/objc/objc-arc.h
R third_party/libobjc/objc/objc-auto.h
R third_party/libobjc/objc/objc.h
R third_party/libobjc/objc/runtime-deprecated.h
R third_party/libobjc/objc/runtime.h
R third_party/libobjc/objc/slot.h
R third_party/libobjc/objc/toydispatch.h
R third_party/libobjc/objc_msgSend.S
R third_party/libobjc/objc_msgSend.arm.S
R third_party/libobjc/objc_msgSend.x86-32.S
R third_party/libobjc/objc_msgSend.x86-64.S
R third_party/libobjc/objcxx_eh.cc
R third_party/libobjc/objcxx_eh.h
R third_party/libobjc/opts/CMakeLists.txt
R third_party/libobjc/opts/COPYING
R third_party/libobjc/opts/ClassIMPCache.cpp
R third_party/libobjc/opts/ClassLookupCache.cpp
R third_party/libobjc/opts/ClassMethodInliner.cpp
R third_party/libobjc/opts/IMPCacher.cpp
R third_party/libobjc/opts/IMPCacher.h
R third_party/libobjc/opts/IvarPass.cpp
R third_party/libobjc/opts/LLVMCompat.h
R third_party/libobjc/opts/LoopIMPCachePass.cpp
R third_party/libobjc/opts/ObjectiveCOpts.cpp
R third_party/libobjc/opts/ObjectiveCOpts.h
R third_party/libobjc/opts/README
R third_party/libobjc/opts/TypeFeedback.cpp
R third_party/libobjc/opts/TypeFeedbackDrivenInliner.cpp
R third_party/libobjc/opts/TypeInfoProvider.h
R third_party/libobjc/pool.h
R third_party/libobjc/properties.h
R third_party/libobjc/properties.m
R third_party/libobjc/protocol.c
R third_party/libobjc/protocol.h
R third_party/libobjc/runtime.c
R third_party/libobjc/sarray2.c
R third_party/libobjc/sarray2.h
R third_party/libobjc/selector.h
R third_party/libobjc/selector_table.c
R third_party/libobjc/sendmsg2.c
R third_party/libobjc/slot_pool.h
R third_party/libobjc/spinlock.h
R third_party/libobjc/statics_loader.c
R third_party/libobjc/string_hash.h
R third_party/libobjc/toydispatch.c
R third_party/libobjc/type_encoding_cases.h
R third_party/libobjc/unistd.h
R third_party/libobjc/unwind-arm.h
R third_party/libobjc/unwind-itanium.h
R third_party/libobjc/unwind.h
R third_party/libobjc/visibility.h
R third_party/luajit/COPYRIGHT
R third_party/luajit/Makefile
R third_party/luajit/README
R third_party/luajit/doc/bluequad-print.css
R third_party/luajit/doc/bluequad.css
R third_party/luajit/doc/changes.html
R third_party/luajit/doc/contact.html
R third_party/luajit/doc/ext_c_api.html
R third_party/luajit/doc/ext_ffi.html
R third_party/luajit/doc/ext_ffi_api.html
R third_party/luajit/doc/ext_ffi_semantics.html
R third_party/luajit/doc/ext_ffi_tutorial.html
R third_party/luajit/doc/ext_jit.html
R third_party/luajit/doc/extensions.html
R third_party/luajit/doc/faq.html
R third_party/luajit/doc/img/contact.png
R third_party/luajit/doc/install.html
R third_party/luajit/doc/luajit.html
R third_party/luajit/doc/running.html
R third_party/luajit/doc/status.html
R third_party/luajit/dynasm/dasm_arm.h
R third_party/luajit/dynasm/dasm_arm.lua
R third_party/luajit/dynasm/dasm_ppc.h
R third_party/luajit/dynasm/dasm_ppc.lua
R third_party/luajit/dynasm/dasm_proto.h
R third_party/luajit/dynasm/dasm_x64.lua
R third_party/luajit/dynasm/dasm_x86.h
R third_party/luajit/dynasm/dasm_x86.lua
R third_party/luajit/dynasm/dynasm.lua
R third_party/luajit/etc/luajit.1
R third_party/luajit/etc/luajit.pc
R third_party/luajit/etc/strict.lua
R third_party/luajit/lib/bc.lua
R third_party/luajit/lib/bcsave.lua
R third_party/luajit/lib/dis_arm.lua
R third_party/luajit/lib/dis_ppc.lua
R third_party/luajit/lib/dis_x64.lua
R third_party/luajit/lib/dis_x86.lua
R third_party/luajit/lib/dump.lua
R third_party/luajit/lib/v.lua
R third_party/luajit/src/Makefile
R third_party/luajit/src/Makefile.dep
R third_party/luajit/src/buildvm.c
R third_party/luajit/src/buildvm.h
R third_party/luajit/src/buildvm_arm.dasc
R third_party/luajit/src/buildvm_arm.h
R third_party/luajit/src/buildvm_asm.c
R third_party/luajit/src/buildvm_fold.c
R third_party/luajit/src/buildvm_lib.c
R third_party/luajit/src/buildvm_peobj.c
R third_party/luajit/src/buildvm_ppc.dasc
R third_party/luajit/src/buildvm_ppc.h
R third_party/luajit/src/buildvm_ppcspe.dasc
R third_party/luajit/src/buildvm_ppcspe.h
R third_party/luajit/src/buildvm_x64.h
R third_party/luajit/src/buildvm_x64win.h
R third_party/luajit/src/buildvm_x86.dasc
R third_party/luajit/src/buildvm_x86.h
R third_party/luajit/src/lauxlib.h
R third_party/luajit/src/lib_aux.c
R third_party/luajit/src/lib_base.c
R third_party/luajit/src/lib_bit.c
R third_party/luajit/src/lib_debug.c
R third_party/luajit/src/lib_ffi.c
R third_party/luajit/src/lib_init.c
R third_party/luajit/src/lib_io.c
R third_party/luajit/src/lib_jit.c
R third_party/luajit/src/lib_math.c
R third_party/luajit/src/lib_os.c
R third_party/luajit/src/lib_package.c
R third_party/luajit/src/lib_string.c
R third_party/luajit/src/lib_table.c
R third_party/luajit/src/lj.supp
R third_party/luajit/src/lj_alloc.c
R third_party/luajit/src/lj_alloc.h
R third_party/luajit/src/lj_api.c
R third_party/luajit/src/lj_arch.h
R third_party/luajit/src/lj_asm.c
R third_party/luajit/src/lj_asm.h
R third_party/luajit/src/lj_asm_arm.h
R third_party/luajit/src/lj_asm_ppc.h
R third_party/luajit/src/lj_asm_x86.h
R third_party/luajit/src/lj_bc.c
R third_party/luajit/src/lj_bc.h
R third_party/luajit/src/lj_bcdump.h
R third_party/luajit/src/lj_bcread.c
R third_party/luajit/src/lj_bcwrite.c
R third_party/luajit/src/lj_carith.c
R third_party/luajit/src/lj_carith.h
R third_party/luajit/src/lj_ccall.c
R third_party/luajit/src/lj_ccall.h
R third_party/luajit/src/lj_ccallback.c
R third_party/luajit/src/lj_ccallback.h
R third_party/luajit/src/lj_cconv.c
R third_party/luajit/src/lj_cconv.h
R third_party/luajit/src/lj_cdata.c
R third_party/luajit/src/lj_cdata.h
R third_party/luajit/src/lj_char.c
R third_party/luajit/src/lj_char.h
R third_party/luajit/src/lj_clib.c
R third_party/luajit/src/lj_clib.h
R third_party/luajit/src/lj_cparse.c
R third_party/luajit/src/lj_cparse.h
R third_party/luajit/src/lj_crecord.c
R third_party/luajit/src/lj_crecord.h
R third_party/luajit/src/lj_ctype.c
R third_party/luajit/src/lj_ctype.h
R third_party/luajit/src/lj_debug.c
R third_party/luajit/src/lj_debug.h
R third_party/luajit/src/lj_def.h
R third_party/luajit/src/lj_dispatch.c
R third_party/luajit/src/lj_dispatch.h
R third_party/luajit/src/lj_emit_arm.h
R third_party/luajit/src/lj_emit_ppc.h
R third_party/luajit/src/lj_emit_x86.h
R third_party/luajit/src/lj_err.c
R third_party/luajit/src/lj_err.h
R third_party/luajit/src/lj_errmsg.h
R third_party/luajit/src/lj_ff.h
R third_party/luajit/src/lj_ffrecord.c
R third_party/luajit/src/lj_ffrecord.h
R third_party/luajit/src/lj_frame.h
R third_party/luajit/src/lj_func.c
R third_party/luajit/src/lj_func.h
R third_party/luajit/src/lj_gc.c
R third_party/luajit/src/lj_gc.h
R third_party/luajit/src/lj_gdbjit.c
R third_party/luajit/src/lj_gdbjit.h
R third_party/luajit/src/lj_ir.c
R third_party/luajit/src/lj_ir.h
R third_party/luajit/src/lj_ircall.h
R third_party/luajit/src/lj_iropt.h
R third_party/luajit/src/lj_jit.h
R third_party/luajit/src/lj_lex.c
R third_party/luajit/src/lj_lex.h
R third_party/luajit/src/lj_lib.c
R third_party/luajit/src/lj_lib.h
R third_party/luajit/src/lj_mcode.c
R third_party/luajit/src/lj_mcode.h
R third_party/luajit/src/lj_meta.c
R third_party/luajit/src/lj_meta.h
R third_party/luajit/src/lj_obj.c
R third_party/luajit/src/lj_obj.h
R third_party/luajit/src/lj_opt_dce.c
R third_party/luajit/src/lj_opt_fold.c
R third_party/luajit/src/lj_opt_loop.c
R third_party/luajit/src/lj_opt_mem.c
R third_party/luajit/src/lj_opt_narrow.c
R third_party/luajit/src/lj_opt_split.c
R third_party/luajit/src/lj_parse.c
R third_party/luajit/src/lj_parse.h
R third_party/luajit/src/lj_record.c
R third_party/luajit/src/lj_record.h
R third_party/luajit/src/lj_snap.c
R third_party/luajit/src/lj_snap.h
R third_party/luajit/src/lj_state.c
R third_party/luajit/src/lj_state.h
R third_party/luajit/src/lj_str.c
R third_party/luajit/src/lj_str.h
R third_party/luajit/src/lj_tab.c
R third_party/luajit/src/lj_tab.h
R third_party/luajit/src/lj_target.h
R third_party/luajit/src/lj_target_arm.h
R third_party/luajit/src/lj_target_ppc.h
R third_party/luajit/src/lj_target_x86.h
R third_party/luajit/src/lj_trace.c
R third_party/luajit/src/lj_trace.h
R third_party/luajit/src/lj_traceerr.h
R third_party/luajit/src/lj_udata.c
R third_party/luajit/src/lj_udata.h
R third_party/luajit/src/lj_vm.h
R third_party/luajit/src/lj_vmevent.c
R third_party/luajit/src/lj_vmevent.h
R third_party/luajit/src/lj_vmmath.c
R third_party/luajit/src/ljamalg.c
R third_party/luajit/src/lua.h
R third_party/luajit/src/lua.hpp
R third_party/luajit/src/luaconf.h
R third_party/luajit/src/luajit.c
R third_party/luajit/src/luajit.h
R third_party/luajit/src/lualib.h
R third_party/luajit/src/msvcbuild.bat
M third_party/qsort_arg.h
M third_party/sptree.h
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool into sql
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
third_party/luajit
Commit: c5c3c3bc4414e78468dc2c73000eb79b549fdb46
https://github.com/mailru/tarantool/commit/c5c3c3bc4414e78468dc2c73000eb79b549fdb46
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
A src/lua/lua_sql.cc
R src/lua/lua_sql.m
A src/lua/mysql.cc
R src/lua/mysql.m
A src/lua/pg.cc
R src/lua/pg.m
Log Message:
-----------
Migrate to C++, too
Commit: ae9610b9bac78635a6f56bbc72c878e642e62c3b
https://github.com/mailru/tarantool/commit/ae9610b9bac78635a6f56bbc72c878e642e62c3b
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
A third_party/luajit
Log Message:
-----------
Return back luajit submodule
Commit: f53b1a635429b14f48f298366c5aead0891e4c5e
https://github.com/mailru/tarantool/commit/f53b1a635429b14f48f298366c5aead0891e4c5e
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
M include/coeio.h
M src/lua/lua_sql.cc
M src/lua/mysql.cc
M src/lua/pg.cc
Log Message:
-----------
Migration to C++ was done.
Commit: b615f6c98a0c4d43077316a87975fc6209083361
https://github.com/mailru/tarantool/commit/b615f6c98a0c4d43077316a87975fc6209083361
Author: Dmitry Simonenko <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M CMakeLists.txt
R cmake/pthread-broken-inline-test.c
M include/tarantool_pthread.h
Log Message:
-----------
Remove old pthread.h checking.
g++ (not gcc) works correctly when dealing with
extern __inline and __extern_inline constructions, thus
this hack is not necessary now.
Commit: ed4c74d9421a542c4d4e2235503395118ca7c8e9
https://github.com/mailru/tarantool/commit/ed4c74d9421a542c4d4e2235503395118ca7c8e9
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
A include/guard.h
R include/scoped_guard.h
M src/admin.cc
M src/admin.rl
M src/box/box_lua.cc
M src/box/lua/box.lua
M src/box/lua/box_net.lua
M src/box/lua/misc.lua
M src/box/lua/sql.lua
M src/coio.cc
M src/iproto.cc
M src/lua/mysql.cc
M src/lua/pg.cc
M src/memcached.cc
M src/tarantool.cc
M test/box/net_sql.test
Log Message:
-----------
Postgresql and MySQL drivers are ready.
Commit: 7df47f6f54e5551a59cf95cc131fa01da1a972fb
https://github.com/mailru/tarantool/commit/7df47f6f54e5551a59cf95cc131fa01da1a972fb
Author: Dmitry Simonenko <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M src/iproto.cc
Log Message:
-----------
define IPROTO_BODY_LEN_MAX as unsigned long by default.
Commit: ac29710763a0be543ca2be0b912bb0778a46d619
https://github.com/mailru/tarantool/commit/ac29710763a0be543ca2be0b912bb0778a46d619
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M test/box/net.box.result
A test/box/net_sql.mysql.result
A test/box/net_sql.mysql.skipcond
A test/box/net_sql.mysql.test
A test/box/net_sql.pg.result
A test/box/net_sql.pg.skipcond
A test/box/net_sql.pg.test
R test/box/net_sql.result
R test/box/net_sql.test
Log Message:
-----------
Tests depend on MYSQL and PG environment variable.
Commit: c734b4d0699bf54759b89a0e9f39333430fbcc49
https://github.com/mailru/tarantool/commit/c734b4d0699bf54759b89a0e9f39333430fbcc49
Author: Dmitry Simonenko <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M test/connector_c/tp.c
M test/connector_c/tp.result
Log Message:
-----------
tp.h: test fixed and refactored.
Commit: 571197371afcd565b287ec2c52a980d42444957d
https://github.com/mailru/tarantool/commit/571197371afcd565b287ec2c52a980d42444957d
Author: Dmitry Simonenko <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M test/connector_c/tp.c
M test/connector_c/tp.result
Log Message:
-----------
tp.h: test fixed and refactored.
Commit: 60ce25c8830c1dcb00b011dd240f2e7e20b7e288
https://github.com/mailru/tarantool/commit/60ce25c8830c1dcb00b011dd240f2e7e20b7e288
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M src/box/lua/sql.lua
M src/lua/pg.cc
M test/box/net_sql.pg.result
M test/box/net_sql.pg.test
Log Message:
-----------
:quote methods for Pg
Commit: 0d3f8f950bce371d46b345b87a4bb28a26dc4ffb
https://github.com/mailru/tarantool/commit/0d3f8f950bce371d46b345b87a4bb28a26dc4ffb
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M src/box/lua/sql.lua
M src/lua/pg.cc
M test/box/net_sql.mysql.result
M test/box/net_sql.mysql.test
M test/box/net_sql.pg.result
M test/box/net_sql.pg.test
Log Message:
-----------
SQL connectors provide transaction.
Commit: 4e707c0f989434b74eb3a859a1b26822a87c42e2
https://github.com/mailru/tarantool/commit/4e707c0f989434b74eb3a859a1b26822a87c42e2
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M .gitignore
M cmake/BuildMisc.cmake
M include/pickle.h
M src/box/box.m
M src/box/tuple.h
M src/box/tuple.m
M test/unit/CMakeLists.txt
A test/unit/base64.c
A test/unit/base64.result
A test/unit/base64.test
M test/unit/unit.h
A third_party/base64.c
A third_party/base64.h
Log Message:
-----------
When loading data from a snapshot, validate tuples
Don't load corrupted tuples.
Commit: 66c4dc6989d48ea1e80de993af501f405ff927cb
https://github.com/mailru/tarantool/commit/66c4dc6989d48ea1e80de993af501f405ff927cb
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M connector/c/include/tp.h
M test/connector_c/tp.c
M test/connector_c/tp.result
Log Message:
-----------
Merge branch 'stable' of github.com:mailru/tarantool into stable
Commit: bd8a292593d9d848cc047967e710a6f4ca93ba10
https://github.com/mailru/tarantool/commit/bd8a292593d9d848cc047967e710a6f4ca93ba10
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M .gitignore
M cmake/BuildMisc.cmake
M include/pickle.h
M src/box/box.cc
M src/box/tuple.cc
M src/box/tuple.h
M test/unit/CMakeLists.txt
A test/unit/base64.c
A test/unit/base64.result
A test/unit/base64.test
M test/unit/unit.h
A third_party/base64.c
A third_party/base64.h
Log Message:
-----------
Merge branch 'stable'
Conflicts:
.gitignore
include/pickle.h
test/unit/CMakeLists.txt
third_party/luajit
Commit: a1b216434edf50cbbd04e3e16cbd2a88f2705a9d
https://github.com/mailru/tarantool/commit/a1b216434edf50cbbd04e3e16cbd2a88f2705a9d
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M debian/changelog
Log Message:
-----------
New debian package.
Commit: e2921ece4288b635dee15fd73e0565e85d163696
https://github.com/mailru/tarantool/commit/e2921ece4288b635dee15fd73e0565e85d163696
Author: Dmitry Simonenko <[email protected]>
Date: 2013-06-10 (Mon, 10 Jun 2013)
Changed paths:
M test/connector_c/tp.c
Log Message:
-----------
tp.h: test refactored.
Commit: fd1b45f56a47014819ed704784c32ed3e965b182
https://github.com/mailru/tarantool/commit/fd1b45f56a47014819ed704784c32ed3e965b182
Author: Dmitry Simonenko <[email protected]>
Date: 2013-06-10 (Mon, 10 Jun 2013)
Changed paths:
M extra/CMakeLists.txt
M extra/rpm.spec.in
Log Message:
-----------
rpm: correct init.d installation path.
Commit: 0f6632c59b226ff7a643ee4fa7cbed6a5e848984
https://github.com/mailru/tarantool/commit/0f6632c59b226ff7a643ee4fa7cbed6a5e848984
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M include/scoped_guard.h
Log Message:
-----------
Fix ScopedGuard crash on GCC 4.7.3 (Bug#1189470)
Commit: d3887fd0476efd88b4a1a7a70b4b478427251ca9
https://github.com/mailru/tarantool/commit/d3887fd0476efd88b4a1a7a70b4b478427251ca9
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M include/assoc.h
M include/box/box.h
M include/log_io.h
M include/pickle.h
M include/recovery.h
M src/box/bitset_index.cc
M src/box/bitset_index.h
M src/box/box.cc
M src/box/box_lua.cc
M src/box/hash_index.cc
M src/box/hash_index.h
M src/box/index.h
M src/box/request.cc
M src/box/request.h
M src/box/space.cc
M src/box/tree_index.cc
M src/box/tree_index.h
M src/box/tuple.cc
M src/box/tuple.h
M src/box/txn.cc
M src/box/txn.h
M src/iproto.cc
M src/log_io.cc
M src/memcached-grammar.cc
M src/memcached-grammar.rl
M src/memcached.cc
M src/recovery.cc
M src/replication.cc
M src/tbuf.c
Log Message:
-----------
Replace 'void *' with 'char *' in most places
Commit: f65019dc4582ad3917ae3009b3e77caaedf1f5bf
https://github.com/mailru/tarantool/commit/f65019dc4582ad3917ae3009b3e77caaedf1f5bf
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M src/memcached-grammar.cc
M src/memcached-grammar.rl
M src/memcached.cc
Log Message:
-----------
Add prefix to memcached methods to prevent future overloading problems
Commit: 28e1f179ec4bec0259e4be2f3c4b1aacfe61e3ca
https://github.com/mailru/tarantool/commit/28e1f179ec4bec0259e4be2f3c4b1aacfe61e3ca
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M include/assoc.h
M include/box/box.h
M include/log_io.h
M include/pickle.h
M include/recovery.h
M src/box/bitset_index.cc
M src/box/bitset_index.h
M src/box/box.cc
M src/box/box_lua.cc
M src/box/hash_index.cc
M src/box/hash_index.h
M src/box/index.h
M src/box/request.cc
M src/box/request.h
M src/box/space.cc
M src/box/tree_index.cc
M src/box/tree_index.h
M src/box/tuple.cc
M src/box/tuple.h
M src/box/txn.cc
M src/box/txn.h
M src/iproto.cc
M src/log_io.cc
M src/memcached-grammar.cc
M src/memcached-grammar.rl
M src/memcached.cc
M src/recovery.cc
M src/replication.cc
M src/tbuf.c
Log Message:
-----------
Merge branch 'char-pointer'
Commit: 9e8234604203c88dd6c6ccf2aa53e21b44ac7c13
https://github.com/mailru/tarantool/commit/9e8234604203c88dd6c6ccf2aa53e21b44ac7c13
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M src/memcached-grammar.cc
M src/memcached-grammar.rl
M src/memcached.cc
Log Message:
-----------
Merge branch 'memcached-fun-prefix'
Commit: 08d3b160f150eb7784a249b43c05db4e16a72b84
https://github.com/mailru/tarantool/commit/08d3b160f150eb7784a249b43c05db4e16a72b84
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
A .travis.yml
Log Message:
-----------
Add a configuration file for Travis CI (http://travis-ci.org/)
Commit: 45d820cf48cf7719fc2c7f5eb930cc4135b596ca
https://github.com/mailru/tarantool/commit/45d820cf48cf7719fc2c7f5eb930cc4135b596ca
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M .travis.yml
Log Message:
-----------
Use RelWithDebugInfo build for Travis CI
Commit: 5c86edb2a4e996cfcf7ccd0e222164b00706f6ec
https://github.com/mailru/tarantool/commit/5c86edb2a4e996cfcf7ccd0e222164b00706f6ec
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M debian/changelog
M debian/rules
Log Message:
-----------
New Debian snapshot.
Commit: 0e4af5730f1e50a274fe1b0da05b3261c870c4a9
https://github.com/mailru/tarantool/commit/0e4af5730f1e50a274fe1b0da05b3261c870c4a9
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M .gitignore
A .travis.yml
M CMakeLists.txt
M cmake/BuildMisc.cmake
R cmake/pthread-broken-inline-test.c
M debian/changelog
M debian/rules
M extra/CMakeLists.txt
M extra/rpm.spec.in
M include/assoc.h
M include/box/box.h
R include/guard.h
M include/log_io.h
M include/pickle.h
M include/recovery.h
A include/scoped_guard.h
M include/tarantool_pthread.h
M src/admin.cc
M src/admin.rl
M src/box/bitset_index.cc
M src/box/bitset_index.h
M src/box/box.cc
M src/box/box_lua.cc
M src/box/hash_index.cc
M src/box/hash_index.h
M src/box/index.h
M src/box/request.cc
M src/box/request.h
M src/box/space.cc
M src/box/tree_index.cc
M src/box/tree_index.h
M src/box/tuple.cc
M src/box/tuple.h
M src/box/txn.cc
M src/box/txn.h
M src/coio.cc
M src/iproto.cc
M src/log_io.cc
M src/lua/mysql.cc
M src/lua/pg.cc
M src/memcached-grammar.cc
M src/memcached-grammar.rl
M src/memcached.cc
M src/recovery.cc
M src/replication.cc
M src/tarantool.cc
M src/tbuf.c
M test/connector_c/tp.c
M test/connector_c/tp.result
M test/unit/CMakeLists.txt
A test/unit/base64.c
A test/unit/base64.result
A test/unit/base64.test
M test/unit/unit.h
A third_party/base64.c
A third_party/base64.h
Log Message:
-----------
Merge branch 'master' of github.com:mailru/tarantool into sql
Conflicts:
include/guard.h
Commit: d0c03bba25acfa9fd58f52ae52ef0f7463ccc998
https://github.com/mailru/tarantool/commit/d0c03bba25acfa9fd58f52ae52ef0f7463ccc998
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M src/lua/mysql.cc
M src/lua/pg.cc
Log Message:
-----------
Drop alloca from exception. Throw only by static strings.
Commit: 7f7c5eb7d847ea403a604fa1811373e9be7003bc
https://github.com/mailru/tarantool/commit/7f7c5eb7d847ea403a604fa1811373e9be7003bc
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M src/lua/mysql.cc
M src/lua/pg.cc
Log Message:
-----------
Copy error string to lua buffer before exception.
Commit: 908fe4190de8e7a6539a75b5019104e7930ba4bb
https://github.com/mailru/tarantool/commit/908fe4190de8e7a6539a75b5019104e7930ba4bb
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M cmake/compiler.cmake
M src/box/bitset_index.cc
M src/box/box_lua.cc
M src/box/hash_index.cc
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/memcached-grammar.cc
M src/memcached-grammar.rl
M src/memcached.cc
M test/box/lua.result
Log Message:
-----------
Replace direct access to tuple->data in obvious cases
Commit: a3767dccde38b62e7dfb7b71da6ae40285513784
https://github.com/mailru/tarantool/commit/a3767dccde38b62e7dfb7b71da6ae40285513784
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-18 (Tue, 18 Jun 2013)
Changed paths:
M .gitignore
M CMakeLists.txt
R cmake/BuildSQL.cmake
M debian/rules
M include/config.h.cmake
M include/lua/init.h
A include/tarantool_plugin.h
M src/CMakeLists.txt
M src/admin.cc
M src/admin.rl
M src/box/lua/sql.lua
M src/lua/init.cc
R src/lua/lua_mysql.h
R src/lua/lua_pg.h
R src/lua/lua_sql.cc
R src/lua/lua_sql.h
R src/lua/pg.cc
A src/plugins/CMakeLists.txt
A src/plugins/mysql/CMakeLists.txt
A src/plugins/mysql/mysql.cc
A src/plugins/pg/CMakeLists.txt
A src/plugins/pg/pg.cc
M test/box/admin.result
M test/box/admin.test
M test/box/net_sql.mysql.result
M test/box/net_sql.mysql.test
M test/box/net_sql.pg.result
M test/box/net_sql.pg.test
M test/test-run.py
Log Message:
-----------
Extract mysql and postgresql drivers to plugins.
Commit: ea79146943e1e790ca8102927e58cd0cbca31bd8
https://github.com/mailru/tarantool/commit/ea79146943e1e790ca8102927e58cd0cbca31bd8
Author: Roman Tsisyk <[email protected]>
Date: 2013-06-18 (Tue, 18 Jun 2013)
Changed paths:
M include/rope.h
M src/box/CMakeLists.txt
M src/box/request.cc
M src/box/request.h
M src/box/tuple.cc
M src/box/tuple.h
A src/box/tuple_update.cc
A src/box/tuple_update.h
M src/rope.c
M test/unit/rope_common.h
M test/unit/rope_stress.c
Log Message:
-----------
Split off box.update code from request.cc
Commit: af4164fb0e5f69d4107364c6cc7fd1862e00572b
https://github.com/mailru/tarantool/commit/af4164fb0e5f69d4107364c6cc7fd1862e00572b
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-18 (Tue, 18 Jun 2013)
Changed paths:
M cmake/compiler.cmake
M src/box/bitset_index.cc
M src/box/box_lua.cc
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/memcached-grammar.cc
M src/memcached-grammar.rl
M src/memcached.cc
Log Message:
-----------
tuple-access: code review fixes
Two significant changes (both arguable, since this patch is about
taste by a large measure):
1) Split tuple_seek() into two: tuple_rewind()
and tuple_seek().
tuple_rewind() simply initializes the iterator and
sets it to 'before-first' position.
tuple_seek() returns a field, and sets the iterator
to the position after the returned field.
Previosly there was only tuple_seek(), which required
tuple_next() to get the field, and it was confusing whether
or not tuple_next() after tuple_seek() is required.
Indeed, the very code I chagned sometimes would
call tuple_next() after tuple_seek() and sometimes would not.
2) Move the return value of the iterator outside
of iteration state.
The advantage of "binding" the out parameters of the iterator to
iterator state is that you bind once, and don't need to supply out
parameters into every call to tuple_next() function. It also makes
it easy to add extra out parameters for bind in the future (field
data type, flags, etc).
This makes "binding" technique popular in database driver
APIs. Binding makes API more stable, which is also
important in drivers.
In this case, however, binding adds for extra lines of code
and (possibly) few extra instructions. Plus, since
this is an internal API which we can change any day,
its stability is not as important. So it seems that for
now we're better of with an API which is a bit
more concise/efficient, and can switch to using binding later,
if needed.
Commit: 8a6400f592efb9624d8749d7f6b5f02bf87a2acf
https://github.com/mailru/tarantool/commit/8a6400f592efb9624d8749d7f6b5f02bf87a2acf
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-18 (Tue, 18 Jun 2013)
Changed paths:
M include/rope.h
M src/box/CMakeLists.txt
M src/box/request.cc
M src/box/request.h
M src/box/tuple.cc
M src/box/tuple.h
A src/box/tuple_update.cc
A src/box/tuple_update.h
M src/rope.c
M test/unit/rope_common.h
M test/unit/rope_stress.c
Log Message:
-----------
Merge branch 'tuple-update'
Commit: c44dbfc6de751590c6a9a654ab06d63fc78fbb54
https://github.com/mailru/tarantool/commit/c44dbfc6de751590c6a9a654ab06d63fc78fbb54
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M include/tarantool_plugin.h
M src/plugins/pg/CMakeLists.txt
M test/box/admin.result
M test/box/admin.test
Log Message:
-----------
Delete double underscore, fix uncertainty in test.
Commit: c04b8a93958a685fd75e01e77ae7a56aad18aae8
https://github.com/mailru/tarantool/commit/c04b8a93958a685fd75e01e77ae7a56aad18aae8
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M .gitignore
M CMakeLists.txt
M debian/rules
M include/coeio.h
M include/config.h.cmake
M include/lua/init.h
A include/tarantool_plugin.h
M src/CMakeLists.txt
M src/admin.cc
M src/admin.rl
M src/box/CMakeLists.txt
M src/box/box_lua.cc
M src/box/lua/box.lua
M src/box/lua/box_net.lua
M src/box/lua/misc.lua
A src/box/lua/sql.lua
M src/lua/init.cc
A src/lua/mysql.cc
A src/plugins/CMakeLists.txt
A src/plugins/mysql/CMakeLists.txt
A src/plugins/mysql/mysql.cc
A src/plugins/pg/CMakeLists.txt
A src/plugins/pg/pg.cc
M test/box/admin.result
M test/box/admin.test
M test/box/net.box.result
A test/box/net_sql.mysql.result
A test/box/net_sql.mysql.skipcond
A test/box/net_sql.mysql.test
A test/box/net_sql.pg.result
A test/box/net_sql.pg.skipcond
A test/box/net_sql.pg.test
M test/test-run.py
Log Message:
-----------
Merge branch 'sql'
Commit: 45a821441ef468611071c666b493c2b492436b55
https://github.com/mailru/tarantool/commit/45a821441ef468611071c666b493c2b492436b55
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M test/lib/test_suite.py
Log Message:
-----------
Test suite: 'rutnime skip' to 'skip', 'skip' to 'disabled'.
@todo: write the reason why we skip a test when we skip it.
Commit: cd1f8f17545e3bacc2f429a9e43f09189d79d455
https://github.com/mailru/tarantool/commit/cd1f8f17545e3bacc2f429a9e43f09189d79d455
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M .gitignore
A .travis.yml
M CMakeLists.txt
M cmake/BuildMisc.cmake
R cmake/pthread-broken-inline-test.c
M debian/changelog
M debian/rules
M extra/CMakeLists.txt
M extra/rpm.spec.in
M include/assoc.h
M include/box/box.h
M include/coeio.h
M include/config.h.cmake
M include/log_io.h
M include/lua/init.h
M include/pickle.h
M include/recovery.h
M include/rope.h
M include/scoped_guard.h
A include/tarantool_plugin.h
M include/tarantool_pthread.h
M src/CMakeLists.txt
M src/admin.cc
M src/admin.rl
M src/box/CMakeLists.txt
M src/box/bitset_index.cc
M src/box/bitset_index.h
M src/box/box.cc
M src/box/box_lua.cc
M src/box/hash_index.cc
M src/box/hash_index.h
M src/box/index.h
M src/box/lua/box.lua
M src/box/lua/box_net.lua
M src/box/lua/misc.lua
A src/box/lua/sql.lua
M src/box/request.cc
M src/box/request.h
M src/box/space.cc
M src/box/tree_index.cc
M src/box/tree_index.h
M src/box/tuple.cc
M src/box/tuple.h
A src/box/tuple_update.cc
A src/box/tuple_update.h
M src/box/txn.cc
M src/box/txn.h
M src/iproto.cc
M src/log_io.cc
M src/lua/init.cc
A src/lua/mysql.cc
M src/memcached-grammar.cc
M src/memcached-grammar.rl
M src/memcached.cc
A src/plugins/CMakeLists.txt
A src/plugins/mysql/CMakeLists.txt
A src/plugins/mysql/mysql.cc
A src/plugins/pg/CMakeLists.txt
A src/plugins/pg/pg.cc
M src/recovery.cc
M src/replication.cc
M src/rope.c
M src/tbuf.c
M test/box/admin.result
M test/box/admin.test
M test/box/lua.result
M test/box/net.box.result
A test/box/net_sql.mysql.result
A test/box/net_sql.mysql.skipcond
A test/box/net_sql.mysql.test
A test/box/net_sql.pg.result
A test/box/net_sql.pg.skipcond
A test/box/net_sql.pg.test
M test/connector_c/tp.c
M test/connector_c/tp.result
M test/lib/test_suite.py
M test/test-run.py
M test/unit/CMakeLists.txt
A test/unit/base64.c
A test/unit/base64.result
A test/unit/base64.test
M test/unit/rope_common.h
M test/unit/rope_stress.c
M test/unit/unit.h
A third_party/base64.c
A third_party/base64.h
Log Message:
-----------
Merge branch 'master' into lua-ffi
Conflicts:
src/box/CMakeLists.txt
src/box/box_lua.cc
Commit: af76349ba1f58d4cfdd8be15d1ca9a9b07f26dd7
https://github.com/mailru/tarantool/commit/af76349ba1f58d4cfdd8be15d1ca9a9b07f26dd7
Author: Konstantin Osipov <[email protected]>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M test/box/lua_box_uuid.skipcond
Log Message:
-----------
box.uuid(): fix the skip condition to work with the new "not found" semantics.
Compare: https://github.com/mailru/tarantool/compare/369f77a42f9c...af76349ba1f5
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
