Viewing all changes in revision 1337.4.10.
- Committer: Eric Day
- Date: 2010-03-25 19:28:37 UTC
- mfrom: (1405 staging)
- mto: This revision was merged to the branch mainline in revision 1409.
- Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.
- files added:
- drizzled/optimizer/cost_vector.h
- plugin/logging_stats
- plugin/logging_stats/tests
- plugin/logging_stats/tests/r
- plugin/logging_stats/tests/t
- plugin/user_function
- files removed:
- drizzled/cost_vect.h
- files renamed:
- tests/r/create_max_fields.result => plugin/blackhole/tests/r/create_max_fields.result
- tests/t/create_max_fields.test => plugin/blackhole/tests/t/create_max_fields.test
- plugin/memcached_functions/tests/t/memc.test => plugin/memcached_functions/tests/t/memc.disabled
- plugin/memcached_stats/tests/t/describe.test => plugin/memcached_stats/tests/t/describe.disabled
- plugin/memcached_stats/tests/t/query.test => plugin/memcached_stats/tests/t/query.disabled
- files modified:
- Makefile.am
expand all
collapse all
added
removed
