« back to all changes in this revision
Viewing changes to plugin/error_dictionary/errors.cc
- Committer: Andrew Hutchings
- Date: 2010-12-06 19:36:53 UTC
- mfrom: (1976 staging)
- mto: This revision was merged to the branch mainline in revision 1991.
- Revision ID: andrew@linuxjedi.co.uk-20101206193653-l85vryv18jb0yxx8
Merge with trunk
- files added:
- drizzled/lock.cc
- drizzled/session
- tests/suite/flush_tables
- tests/suite/flush_tables/r
- tests/suite/flush_tables/t
- files removed:
- drizzled/internal/getrusage.h
- files renamed:
- drizzled/session_list.cc => drizzled/session/cache.cc
- drizzled/session_list.h => drizzled/session/cache.h
- plugin/user_locks/tests/t/user_concurrent.test => plugin/user_locks/tests/t/user_concurrent.disabled
- files modified:
- client/drizzle.cc
added
removed
plugin/error_dictionary/errors.cc
