Branch: refs/heads/master
Home: https://github.com/mailru/tarantool
Commit: 3e2de4b1f399b58ce4789c5987da44a68294c696
https://github.com/mailru/tarantool/commit/3e2de4b1f399b58ce4789c5987da44a68294c696
Author: Konstantin Osipov <[email protected]>
Date: 2011-05-11 (Wed, 11 May 2011)
Changed paths:
M mod/silverbox/box.c
M mod/silverbox/index.c
M mod/silverbox/index.h
M test/box/sql.result
M test/box/sql.test
A test/box/tarantool_bug735140.cfg
Log Message:
-----------
Merge branch 'master-stable' into box-#769040
Commit: 72bfb7f931758faea48e98a93ae01aa25a9093a7
https://github.com/mailru/tarantool/commit/72bfb7f931758faea48e98a93ae01aa25a9093a7
Author: Roman Tokarev <[email protected]>
Date: 2011-05-11 (Wed, 11 May 2011)
Changed paths:
M core/CMakeLists.txt
A core/errcode.c
M core/iproto.c
M core/pickle.c
A include/errcode.h
M include/fiber.h
M include/iproto.h
M include/util.h
M mod/silverbox/box.c
M mod/silverbox/box.h
M mod/silverbox/index.c
M mod/silverbox/memcached.c
M mod/silverbox/memcached.rl
Log Message:
-----------
Isolate error codes definition from iproto.[ch] to errcode.[ch].
Add errcode_record structure that contains string represenataion of
an error, numerical value of an error to send to a client, and
textual description of an error.
Commit: 7c0620f4ac272d8fd591738b832af672bda49d25
https://github.com/mailru/tarantool/commit/7c0620f4ac272d8fd591738b832af672bda49d25
Author: Roman Tokarev <[email protected]>
Date: 2011-05-11 (Wed, 11 May 2011)
Changed paths:
M include/errcode.h
Log Message:
-----------
Make implicit numeration for error codes.
Commit: a663458716eb5a4a9b071170909e5484b03af3a8
https://github.com/mailru/tarantool/commit/a663458716eb5a4a9b071170909e5484b03af3a8
Author: Konstantin Osipov <[email protected]>
Date: 2011-05-11 (Wed, 11 May 2011)
Changed paths:
M core/errcode.c
M include/errcode.h
Log Message:
-----------
Bug#769040, review comments.
Move the definition of an auxiliary macro to errcode.c.
Remove a barely justified macro.
Commit: e7efa2bb9f8f2cd049fa0b4d3144cb45c16bfb7f
https://github.com/mailru/tarantool/commit/e7efa2bb9f8f2cd049fa0b4d3144cb45c16bfb7f
Author: Konstantin Osipov <[email protected]>
Date: 2011-05-11 (Wed, 11 May 2011)
Changed paths:
M core/CMakeLists.txt
A core/errcode.c
M core/iproto.m
M core/pickle.m
A include/errcode.h
M include/fiber.h
M include/iproto.h
M include/util.h
M mod/box/box.m
M mod/box/index.m
M mod/box/memcached.m
M mod/box/memcached.rl
Log Message:
-----------
Merge branch 'master-stable'
Manual merge.
Conflicts:
core/CMakeLists.txt
core/pickle.m
mod/box/box.h
mod/box/memcached.m
Compare: https://github.com/mailru/tarantool/compare/19a4707...e7efa2b
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
