Viewing all changes in revision 1994.4.18.
- Committer: Marisa Plumb
- Date: 2011-01-07 00:24:26 UTC
- mfrom: (2060 clean)
- mto: (2062.1.1 build) (2086.1.3 build) (2085.1.2 build) (2094.1.5 build) (2114.1.1 build) (2173.1.1 build) (2184.1.2 build) (2193.1.1 build) (2215.1.1 build) (2227.1.3 build) (2235.2.4 build)
- mto: This revision was merged to the branch mainline in revision 2063.
- Revision ID: marisa.plumb@gmail.com-20110107002426-ka01xxjbqj9o8tee
merged with up to date trunk
- files added:
- docs/clients/drizzleadmin.rst
- drizzled/function/cast
- drizzled/item/function
- 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/mysql_protocol/docs
- 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/ddl_transactions
- 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/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.cc
- files renamed:
- 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/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
- m4/ac_cxx_compile_stdcxx_0x.m4 => m4/pandora_compile_stdcxx_0x.m4
- m4/ac_cxx_header_stdcxx_98.m4 => m4/pandora_header_stdcxx_98.m4
- plugin/crash_function/ => plugin/debug/
- plugin/innobase/btr/btr0btr.c => plugin/innobase/btr/btr0btr.cc
- plugin/innobase/btr/btr0cur.c => plugin/innobase/btr/btr0cur.cc
- plugin/innobase/btr/btr0pcur.c => plugin/innobase/btr/btr0pcur.cc
- plugin/innobase/btr/btr0sea.c => plugin/innobase/btr/btr0sea.cc
- plugin/innobase/buf/buf0buddy.c => plugin/innobase/buf/buf0buddy.cc
- plugin/innobase/buf/buf0buf.c => plugin/innobase/buf/buf0buf.cc
- plugin/innobase/buf/buf0flu.c => plugin/innobase/buf/buf0flu.cc
- plugin/innobase/buf/buf0lru.c => plugin/innobase/buf/buf0lru.cc
- plugin/innobase/buf/buf0rea.c => plugin/innobase/buf/buf0rea.cc
- plugin/innobase/data/data0data.c => plugin/innobase/data/data0data.cc
- plugin/innobase/data/data0type.c => plugin/innobase/data/data0type.cc
- plugin/innobase/dict/create_replication.c => plugin/innobase/dict/create_replication.cc
- plugin/innobase/dict/dict0boot.c => plugin/innobase/dict/dict0boot.cc
- plugin/innobase/dict/dict0crea.c => plugin/innobase/dict/dict0crea.cc
- plugin/innobase/dict/dict0dict.c => plugin/innobase/dict/dict0dict.cc
- plugin/innobase/dict/dict0load.c => plugin/innobase/dict/dict0load.cc
- plugin/innobase/dict/dict0mem.c => plugin/innobase/dict/dict0mem.cc
- plugin/innobase/dyn/dyn0dyn.c => plugin/innobase/dyn/dyn0dyn.cc
- plugin/innobase/eval/eval0eval.c => plugin/innobase/eval/eval0eval.cc
- plugin/innobase/eval/eval0proc.c => plugin/innobase/eval/eval0proc.cc
- plugin/innobase/fil/fil0fil.c => plugin/innobase/fil/fil0fil.cc
- plugin/innobase/fsp/fsp0fsp.c => plugin/innobase/fsp/fsp0fsp.cc
- plugin/innobase/fut/fut0fut.c => plugin/innobase/fut/fut0fut.cc
- plugin/innobase/fut/fut0lst.c => plugin/innobase/fut/fut0lst.cc
- plugin/innobase/ha/ha0ha.c => plugin/innobase/ha/ha0ha.cc
- plugin/innobase/ha/ha0storage.c => plugin/innobase/ha/ha0storage.cc
- plugin/innobase/ha/hash0hash.c => plugin/innobase/ha/hash0hash.cc
- plugin/innobase/ibuf/ibuf0ibuf.c => plugin/innobase/ibuf/ibuf0ibuf.cc
- plugin/innobase/lock/lock0iter.c => plugin/innobase/lock/lock0iter.cc
- plugin/innobase/lock/lock0lock.c => plugin/innobase/lock/lock0lock.cc
- plugin/innobase/log/log0log.c => plugin/innobase/log/log0log.cc
- plugin/innobase/log/log0recv.c => plugin/innobase/log/log0recv.cc
- plugin/innobase/mach/mach0data.c => plugin/innobase/mach/mach0data.cc
- plugin/innobase/mem/mem0dbg.c => plugin/innobase/mem/mem0dbg.cc
- plugin/innobase/mem/mem0mem.c => plugin/innobase/mem/mem0mem.cc
- plugin/innobase/mem/mem0pool.c => plugin/innobase/mem/mem0pool.cc
- plugin/innobase/mtr/mtr0log.c => plugin/innobase/mtr/mtr0log.cc
- plugin/innobase/mtr/mtr0mtr.c => plugin/innobase/mtr/mtr0mtr.cc
- plugin/innobase/os/os0file.c => plugin/innobase/os/os0file.cc
- plugin/innobase/os/os0proc.c => plugin/innobase/os/os0proc.cc
- plugin/innobase/os/os0sync.c => plugin/innobase/os/os0sync.cc
- plugin/innobase/os/os0thread.c => plugin/innobase/os/os0thread.cc
- plugin/innobase/page/page0cur.c => plugin/innobase/page/page0cur.cc
- plugin/innobase/page/page0page.c => plugin/innobase/page/page0page.cc
- plugin/innobase/page/page0zip.c => plugin/innobase/page/page0zip.cc
- plugin/innobase/pars/pars0opt.c => plugin/innobase/pars/pars0opt.cc
- plugin/innobase/pars/pars0pars.c => plugin/innobase/pars/pars0pars.cc
- plugin/innobase/pars/pars0sym.c => plugin/innobase/pars/pars0sym.cc
- plugin/innobase/que/que0que.c => plugin/innobase/que/que0que.cc
- plugin/innobase/read/read0read.c => plugin/innobase/read/read0read.cc
- plugin/innobase/rem/rem0cmp.c => plugin/innobase/rem/rem0cmp.cc
- plugin/innobase/rem/rem0rec.c => plugin/innobase/rem/rem0rec.cc
- plugin/innobase/row/row0ext.c => plugin/innobase/row/row0ext.cc
- plugin/innobase/row/row0ins.c => plugin/innobase/row/row0ins.cc
- plugin/innobase/row/row0merge.c => plugin/innobase/row/row0merge.cc
- plugin/innobase/row/row0mysql.c => plugin/innobase/row/row0mysql.cc
- plugin/innobase/row/row0purge.c => plugin/innobase/row/row0purge.cc
- plugin/innobase/row/row0row.c => plugin/innobase/row/row0row.cc
- plugin/innobase/row/row0sel.c => plugin/innobase/row/row0sel.cc
- plugin/innobase/row/row0uins.c => plugin/innobase/row/row0uins.cc
- plugin/innobase/row/row0umod.c => plugin/innobase/row/row0umod.cc
- plugin/innobase/row/row0undo.c => plugin/innobase/row/row0undo.cc
- plugin/innobase/row/row0upd.c => plugin/innobase/row/row0upd.cc
- plugin/innobase/row/row0vers.c => plugin/innobase/row/row0vers.cc
- plugin/innobase/srv/srv0srv.c => plugin/innobase/srv/srv0srv.cc
- plugin/innobase/srv/srv0start.c => plugin/innobase/srv/srv0start.cc
- plugin/innobase/sync/sync0arr.c => plugin/innobase/sync/sync0arr.cc
- plugin/innobase/sync/sync0rw.c => plugin/innobase/sync/sync0rw.cc
- plugin/innobase/sync/sync0sync.c => plugin/innobase/sync/sync0sync.cc
- plugin/innobase/thr/thr0loc.c => plugin/innobase/thr/thr0loc.cc
- plugin/innobase/trx/trx0i_s.c => plugin/innobase/trx/trx0i_s.cc
- plugin/innobase/trx/trx0purge.c => plugin/innobase/trx/trx0purge.cc
- plugin/innobase/trx/trx0rec.c => plugin/innobase/trx/trx0rec.cc
- plugin/innobase/trx/trx0roll.c => plugin/innobase/trx/trx0roll.cc
- plugin/innobase/trx/trx0rseg.c => plugin/innobase/trx/trx0rseg.cc
- plugin/innobase/trx/trx0sys.c => plugin/innobase/trx/trx0sys.cc
- plugin/innobase/trx/trx0trx.c => plugin/innobase/trx/trx0trx.cc
- plugin/innobase/trx/trx0undo.c => plugin/innobase/trx/trx0undo.cc
- plugin/innobase/usr/usr0sess.c => plugin/innobase/usr/usr0sess.cc
- plugin/innobase/ut/ut0byte.c => plugin/innobase/ut/ut0byte.cc
- plugin/innobase/ut/ut0dbg.c => plugin/innobase/ut/ut0dbg.cc
- plugin/innobase/ut/ut0list.c => plugin/innobase/ut/ut0list.cc
- plugin/innobase/ut/ut0mem.c => plugin/innobase/ut/ut0mem.cc
- plugin/innobase/ut/ut0rbt.c => plugin/innobase/ut/ut0rbt.cc
- plugin/innobase/ut/ut0rnd.c => plugin/innobase/ut/ut0rnd.cc
- plugin/innobase/ut/ut0ut.c => plugin/innobase/ut/ut0ut.cc
- plugin/innobase/ut/ut0vec.c => plugin/innobase/ut/ut0vec.cc
- plugin/innobase/ut/ut0wqueue.c => plugin/innobase/ut/ut0wqueue.cc
- plugin/session_dictionary/tests/t/slap.test => plugin/session_dictionary/tests/t/slap.disabled
- plugin/utility_functions/tests/t/execute.test => plugin/utility_functions/tests/t/execute_complex.disabled
- files modified:
- .bzrignore
expand all
collapse all
added
removed
