Viewing all changes in revision 673.5.15.
- Committer: Andrew Hutchings
- Date: 2008-12-30 16:37:39 UTC
- mfrom: (754 testable)
- mto: (754.1.2 devel)
- mto: This revision was merged to the branch mainline in revision 755.
- Revision ID: linuxjedi@linuxjedi-laptop-20081230163739-exi2e9veayyuzaai
Merge with trunk
- files added:
- tests/r/csv_alter_table.result
- files removed:
- tests/include/not_windows.inc
- files renamed:
- tests/suite/broken/r/connect.result => tests/r/connect.result
- tests/suite/broken/r/create.result => tests/r/create.result
- tests/suite/broken/r/create_not_windows.result => tests/r/create_not_windows.result
- tests/suite/broken/r/csv.result => tests/r/csv.result
- tests/suite/broken/r/csv_not_null.result => tests/r/csv_not_null.result
- tests/suite/broken/r/default.result => tests/r/default.result
- tests/suite/broken/r/derived.result => tests/r/derived.result
- tests/suite/broken/r/have_binlog_format_mixed.require => tests/r/have_binlog_format_mixed.require
- tests/suite/broken/r/have_binlog_format_row.require => tests/r/have_binlog_format_row.require
- tests/suite/broken/r/have_debug.require => tests/r/have_debug.require
- tests/suite/broken/r/have_symlink.require => tests/r/have_symlink.require
- tests/suite/broken/r/error_simulation.result => tests/r/small_tmp_table.result
- tests/suite/broken/r/subselect_mat.result => tests/r/subselect_mat.result
- tests/suite/broken/r/subselect_no_mat.result => tests/r/subselect_no_mat.result
- tests/suite/broken/r/symlink.result => tests/r/symlink.result
- tests/suite/broken/r/user_var-binlog.result => tests/r/user_var-binlog.result
- tests/suite/broken/r/user_var.result => tests/r/user_var.result
- tests/suite/broken/r/variables.result => tests/r/variables.result
- tests/suite/broken/r/variables_debug.result => tests/r/variables_debug.result
- tests/suite/mordred/t/concurrent_innodb.test => tests/suite/broken/t/concurrent_innodb.test
- tests/suite/mordred/t/connect.test => tests/t/connect.test
- tests/suite/mordred/t/create.test => tests/t/create.test
- tests/suite/mordred/t/create_not_windows.test => tests/t/create_not_windows.test
- tests/suite/mordred/t/csv.test => tests/t/csv.test
- tests/suite/mordred/t/csv_alter_table.test => tests/t/csv_alter_table.test
- tests/suite/mordred/t/csv_not_null.test => tests/t/csv_not_null.test
- tests/suite/mordred/t/default.test => tests/t/default.test
- tests/suite/mordred/t/derived.test => tests/t/derived.test
- tests/suite/mordred/t/error_simulation.test => tests/t/small_tmp_table.test
- tests/suite/broken/t/subselect_mat.test => tests/t/subselect_mat.test
- tests/suite/broken/t/subselect_no_mat.test => tests/t/subselect_no_mat.test
- tests/suite/broken/t/symlink.test => tests/t/symlink.test
- tests/suite/broken/t/user_var-binlog.test => tests/t/user_var-binlog.test
- tests/suite/broken/t/user_var.test => tests/t/user_var.test
- tests/suite/broken/t/variables-master.opt => tests/t/variables-master.opt
- tests/suite/broken/t/variables.test => tests/t/variables.test
- tests/suite/broken/t/variables_debug.test => tests/t/variables_debug.test
- files modified:
- drizzled/drizzled.cc
expand all
collapse all
added
removed
