Viewing all changes in revision 1923.3.3.
- Committer: Andrew Hutchings
- Date: 2010-11-19 11:08:43 UTC
- mfrom: (1937 staging)
- mto: (1942.1.2 b)
- mto: This revision was merged to the branch mainline in revision 1943.
- Revision ID: andrew@linuxjedi.co.uk-20101119110843-biuv3hzzfge93qel
Merge trunk into branch
- files added:
- drizzled/display.cc
- drizzled/plugin/client
- plugin/transaction_log/utilities
- tests/suite/execute
- tests/suite/execute/r
- tests/suite/execute/t
- files removed:
- drizzled/message/transaction_manager.cc
- plugin/errmsg_notify/tests
- plugin/errmsg_notify/tests/r
- plugin/errmsg_notify/tests/t
- files renamed:
- tests/r/execute.result => tests/suite/execute/r/basic.result
- tests/t/execute.test => tests/suite/execute/t/basic.test
- files modified:
- client/drizzle.cc
expand all
collapse all
added
removed
