« back to all changes in this revision
Viewing changes to drizzled/drizzled.cc
- Committer: Barry.Leslie at PrimeBase
- Date: 2010-07-14 19:45:50 UTC
- mfrom: (1660 build)
- mto: This revision was merged to the branch mainline in revision 1662.
- Revision ID: barry.leslie@primebase.com-20100714194550-lf2vn7tnum6keqeo
Merge from main trunk.
- files added:
- drizzled/generator
- files removed:
- plugin/blitzdb/tests/t/blitzdb-alter-master.opt
- plugin/blitzdb/tests/t/blitzdb-basic-master.opt
- plugin/blitzdb/tests/t/blitzdb-decimal-master.opt
- plugin/blitzdb/tests/t/blitzdb-index-master.opt
- plugin/blitzdb/tests/t/blitzdb-indexes-master.opt
- plugin/blitzdb/tests/t/blitzdb-join-master.opt
- plugin/blitzdb/tests/t/blitzdb-range-master.opt
- files renamed:
- plugin/blitzdb/tests/t/blitzdb-master.opt => plugin/blitzdb/tests/t/master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_additional_mem_pool_size_default.result => plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_addtl_mem_pool_size_default.result
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_default-master.opt => plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_addtl_mem_pool_size_default-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_default.test => plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_addtl_mem_pool_size_default.test
- tests/r/mysqldump-max.result => tests/r/drizzledump-max.result
- tests/t/mysqldump-max.test => tests/t/drizzledump-max.test
- files modified:
- Makefile.am
added
removed
drizzled/drizzled.cc
