« back to all changes in this revision
Viewing changes to drizzled/natural_join_column.h
- Committer: Jay Pipes
- Date: 2009-12-08 17:46:38 UTC
- mfrom: (1240 staging)
- mto: This revision was merged to the branch mainline in revision 1245.
- Revision ID: jpipes@serialcoder-20091208174638-exwaq2vbq0bzvyze
Merge trunk
- files added:
- drizzled/optimizer/sum.h
- plugin/archive/tests
- plugin/archive/tests/r
- plugin/archive/tests/t
- plugin/blackhole/tests
- plugin/blackhole/tests/r
- plugin/blackhole/tests/t
- plugin/crc32/tests
- plugin/crc32/tests/r
- plugin/crc32/tests/t
- plugin/csv/tests
- plugin/csv/tests/r
- plugin/csv/tests/t
- plugin/pool_of_threads/tests
- plugin/pool_of_threads/tests/r
- plugin/pool_of_threads/tests/t
- plugin/single_thread/tests
- plugin/single_thread/tests/r
- plugin/single_thread/tests/t
- files removed:
- drizzled/function/signed.cc
- files renamed:
- drizzled/opt_range.cc => drizzled/optimizer/range.cc
- drizzled/opt_range.h => drizzled/optimizer/range.h
- drizzled/opt_sum.cc => drizzled/optimizer/sum.cc
- drizzled/time.cc => drizzled/time_functions.cc
- tests/r/archive.result => plugin/archive/tests/r/archive.result
- tests/r/archive_aio_posix.result => plugin/archive/tests/r/archive_aio_posix.result
- tests/r/archive_basic.result => plugin/archive/tests/r/archive_basic.result
- tests/r/archive_discover.result => plugin/archive/tests/r/archive_discover.result
- tests/t/archive.test => plugin/archive/tests/t/archive.test
- tests/t/archive_aio_posix.test => plugin/archive/tests/t/archive_aio_posix.test
- tests/t/archive_basic.test => plugin/archive/tests/t/archive_basic.test
- tests/t/archive_discover.test => plugin/archive/tests/t/archive_discover.test
- tests/r/blackhole.result => plugin/blackhole/tests/r/blackhole.result
- tests/t/blackhole.test => plugin/blackhole/tests/t/blackhole.test
- tests/r/crc32.result => plugin/crc32/tests/r/crc32.result
- tests/t/crc32-master.opt => plugin/crc32/tests/t/crc32-master.opt
- tests/t/crc32.test => plugin/crc32/tests/t/crc32.test
- tests/r/csv.result => plugin/csv/tests/r/csv.result
- tests/r/csv_alter_table.result => plugin/csv/tests/r/csv_alter_table.result
- tests/r/csv_not_null.result => plugin/csv/tests/r/csv_not_null.result
- tests/t/csv.test => plugin/csv/tests/t/csv.test
- tests/t/csv_alter_table.test => plugin/csv/tests/t/csv_alter_table.test
- tests/t/csv_not_null.test => plugin/csv/tests/t/csv_not_null.test
- tests/suite/md5/ => plugin/md5/tests/
- tests/suite/memcached_functions/ => plugin/memcached_functions/tests/
- tests/suite/memcached_stats/ => plugin/memcached_stats/tests/
- tests/r/pool_of_threads.result => plugin/pool_of_threads/tests/r/pool_of_threads.result
- tests/t/pool_of_threads.test => plugin/pool_of_threads/tests/t/pool_of_threads.test
- tests/suite/sleep/ => plugin/sleep/tests/
- tests/suite/transaction_log/ => plugin/transaction_log/tests/
- files modified:
- .bzrignore
added
removed
drizzled/natural_join_column.h
