Viewing all changes in revision 1638.2.3.
- Committer: Stewart Smith
- Date: 2010-07-13 01:41:55 UTC
- mfrom: (1638.1.4 default-collation-in-table-message)
- mto: (1638.4.2) (1668.2.1 01-remove-unused-row-type-in-table-message)
- mto: This revision was merged to the branch mainline in revision 1672.
- Revision ID: stewart@flamingspork.com-20100713014155-phng9213e22fjy63
merge trunk
- files added:
- drizzled/generator
- plugin/pbms
- plugin/pbms/src
- plugin/pbms/src/cslib
- plugin/syslog
- 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
- plugin/logging_syslog
- 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:
- .quickly
expand all
collapse all
added
removed
