Viewing all changes in revision 1890.2.2.
- Committer: Stewart Smith
- Date: 2010-12-29 00:10:33 UTC
- mfrom: (2037 clean)
- mto: (2099.1.3 build)
- mto: This revision was merged to the branch mainline in revision 2100.
- Revision ID: stewart@flamingspork.com-20101229001033-ef5dixj4fq4x64fr
merge trunk
- files added:
- client/wakeup.h
- docs/testing
- drizzled/function/cast
- drizzled/item/function
- drizzled/locking
- drizzled/plugin/client
- drizzled/session
- drizzled/type
- plugin/debug/tests
- plugin/debug/tests/r
- plugin/debug/tests/t
- plugin/drizzle_protocol/docs
- plugin/error_dictionary
- plugin/error_dictionary/tests
- plugin/error_dictionary/tests/r
- plugin/error_dictionary/tests/t
- plugin/haildb/docs
- plugin/mysql_protocol/docs
- plugin/pbms/tests
- plugin/pbms/tests/r
- plugin/pbms/tests/t
- plugin/string_functions/tests
- plugin/string_functions/tests/r
- plugin/string_functions/tests/t
- plugin/transaction_log/utilities
- tests/suite/bool_type
- tests/suite/bool_type/r
- tests/suite/bool_type/t
- tests/suite/cast
- tests/suite/cast/r
- tests/suite/cast/t
- tests/suite/execute
- tests/suite/execute/r
- tests/suite/execute/t
- tests/suite/flush_tables
- tests/suite/flush_tables/r
- tests/suite/flush_tables/t
- tests/suite/identifiers
- tests/suite/identifiers/r
- tests/suite/identifiers/t
- tests/suite/mysql_compatibility
- tests/suite/mysql_compatibility/r
- tests/suite/mysql_compatibility/t
- tests/suite/slap
- tests/suite/slap/r
- tests/suite/slap/t
- tests/suite/time_type
- tests/suite/time_type/r
- tests/suite/time_type/t
- tests/suite/unsigned_integer_type
- tests/suite/unsigned_integer_type/r
- tests/suite/unsigned_integer_type/t
- tests/suite/uuid_type
- tests/suite/uuid_type/r
- tests/suite/uuid_type/t
- files removed:
- client/errname.h
- plugin/errmsg_notify/tests
- plugin/errmsg_notify/tests/r
- plugin/errmsg_notify/tests/t
- files renamed:
- client/errname.cc => client/errname.cc.THIS
- drizzled/field/timestamp.cc => drizzled/field/epoch.cc
- drizzled/field/timestamp.h => drizzled/field/epoch.h
- drizzled/field/long.cc => drizzled/field/int32.cc
- drizzled/field/long.h => drizzled/field/int32.h
- drizzled/field/int64_t.cc => drizzled/field/int64.cc
- drizzled/field/int64_t.h => drizzled/field/int64.h
- drizzled/internal/mf_cache.cc => drizzled/internal/iocache.cc
- drizzled/lock.cc => drizzled/locking/global.cc
- drizzled/session_list.cc => drizzled/session/cache.cc
- drizzled/session_list.h => drizzled/session/cache.h
- drizzled/decimal.cc => drizzled/type/decimal.cc
- drizzled/decimal.h => drizzled/type/decimal.h
- drizzled/drizzle_time.cc => drizzled/type/time.cc
- drizzled/drizzle_time.h => drizzled/type/time.h
- plugin/crash_function/ => plugin/debug/
- plugin/session_dictionary/tests/t/slap.test => plugin/session_dictionary/tests/t/slap.disabled
- tests/r/execute.result => tests/suite/execute/r/basic.result
- tests/t/execute.test => tests/suite/execute/t/basic.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
