Viewing all changes in revision 687.
- Committer: Andrew Hutchings
- Date: 2008-12-24 00:54:13 UTC
- mfrom: (673.1.72 testable)
- Revision ID: linuxjedi@linuxjedi-laptop-20081224005413-v3bt9abee1cna73c
Merge with trunk
- files added:
- drizzled/query_arena.h
- files removed:
- tests/include/have_community_features.inc
- files renamed:
- tests/suite/broken/r/mysqladmin.result => tests/r/drizzleadmin.result
- tests/suite/broken/r/mysqlcheck.result => tests/r/drizzlecheck.result
- tests/suite/broken/r/group_min_max.result => tests/r/group_min_max.result
- tests/suite/broken/r/have_met_timezone.require => tests/r/have_met_timezone.require
- tests/suite/broken/r/mysql.result => tests/r/mysql.result
- tests/suite/broken/r/negation_elimination.result => tests/r/negation_elimination.result
- tests/suite/broken/r/not_as_root.require => tests/r/not_as_root.require
- tests/suite/broken/r/null_key.result => tests/r/null_key.result
- tests/suite/broken/r/odbc.result => tests/r/odbc.result
- tests/suite/broken/r/olap.result => tests/r/olap.result
- tests/suite/broken/r/repair.result => tests/r/repair.result
- tests/suite/broken/r/select_found.result => tests/r/select_found.result
- tests/suite/broken/r/select_safe.result => tests/r/select_safe.result
- tests/suite/broken/r/show_check.result => tests/r/show_check.result
- tests/suite/broken/r/snowman.result => tests/r/snowman.result
- tests/suite/broken/r/status.result => tests/r/status.result
- tests/suite/broken/r/sum_distinct-big.result => tests/r/sum_distinct-big.result
- tests/suite/broken/r/sysdate_is_now.result => tests/r/sysdate_is_now.result
- tests/suite/broken/r/temp_table.result => tests/r/temp_table.result
- tests/suite/broken/r/timezone.result => tests/r/timezone.result
- tests/suite/broken/r/timezone4.result => tests/r/timezone4.result
- tests/suite/broken/r/truncate.result => tests/r/truncate.result
- tests/suite/broken/r/type_decimal.result => tests/r/type_decimal.result
- tests/suite/broken/r/type_enum.result => tests/r/type_enum.result
- tests/suite/broken/r/type_binary.result => tests/r/type_varbinary.result
- tests/suite/broken/r/union.result => tests/r/union.result
- tests/suite/broken/r/varbinary.result => tests/r/varbinary.result
- tests/suite/broken/r/variables-big.result => tests/r/variables-big.result
- tests/suite/broken/r/variables+c.result => tests/r/variables_c.result
- tests/suite/broken/r/warnings.result => tests/r/warnings.result
- tests/suite/broken/t/mysqladmin.test => tests/t/drizzleadmin.test
- tests/suite/broken/t/mysqlcheck.test => tests/t/drizzlecheck.test
- tests/suite/broken/t/group_min_max.test => tests/t/group_min_max.test
- tests/suite/broken/t/mysql.test => tests/t/mysql.test
- tests/suite/broken/t/mysql_delimiter.sql => tests/t/mysql_delimiter.sql
- tests/suite/broken/t/mysql_delimiter_19799.sql => tests/t/mysql_delimiter_19799.sql
- tests/suite/broken/t/mysql_delimiter_source.sql => tests/t/mysql_delimiter_source.sql
- tests/suite/broken/t/negation_elimination.test => tests/t/negation_elimination.test
- tests/suite/broken/t/null_key.test => tests/t/null_key.test
- tests/suite/broken/t/odbc.test => tests/t/odbc.test
- tests/suite/broken/t/olap.test => tests/t/olap.test
- tests/suite/broken/t/repair.test => tests/t/repair.test
- tests/suite/broken/t/select_found.test => tests/t/select_found.test
- tests/suite/broken/t/select_safe.test => tests/t/select_safe.test
- tests/suite/broken/t/show_check.test => tests/t/show_check.test
- tests/suite/broken/t/snowman.test => tests/t/snowman.test
- tests/suite/broken/t/status.test => tests/t/status.test
- tests/suite/broken/t/sum_distinct-big.test => tests/t/sum_distinct-big.test
- tests/suite/broken/t/sysdate_is_now-master.opt => tests/t/sysdate_is_now-master.opt
- tests/suite/broken/t/sysdate_is_now.test => tests/t/sysdate_is_now.test
- tests/suite/broken/t/temp_table-master.opt => tests/t/temp_table-master.opt
- tests/suite/broken/t/temp_table.test => tests/t/temp_table.test
- tests/suite/broken/t/timezone-master.opt => tests/t/timezone-master.opt
- tests/suite/broken/t/timezone.test => tests/t/timezone.test
- tests/suite/broken/t/timezone4-master.opt => tests/t/timezone4-master.opt
- tests/suite/broken/t/timezone4.test => tests/t/timezone4.test
- tests/suite/broken/t/truncate.test => tests/t/truncate.test
- tests/suite/broken/t/type_decimal.test => tests/t/type_decimal.test
- tests/suite/broken/t/type_enum.test => tests/t/type_enum.test
- tests/suite/broken/t/type_binary.test => tests/t/type_varbinary.test
- tests/suite/broken/t/union.test => tests/t/union.test
- tests/suite/broken/t/varbinary.test => tests/t/varbinary.test
- tests/suite/broken/t/variables-big.test => tests/t/variables-big.test
- tests/suite/broken/t/variables+c.test => tests/t/variables_c.test
- tests/suite/broken/t/warnings-master.opt => tests/t/warnings-master.opt
- tests/suite/broken/t/warnings.test => tests/t/warnings.test
- tests/suite/broken/t/warnings_engine_disabled-master.opt => tests/t/warnings_engine_disabled-master.opt
- files modified:
- .bzrignore
expand all
collapse all
added
removed
