← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

Viewing all changes in revision 1824.

Committer: Brian Aker
Date: 2010-10-08 20:13:50 UTC
mfrom: (1823.1.3 trunk-drizzle)
Revision ID: brian@tangent.org-20101008201350-bmjpgakk12zmyw10

Overall merge of Padraig

files added:
tests/include/have_valgrind.inc

tests/r/have_valgrind.require

files removed:
drizzled/sql_bitmap.cc

drizzled/sql_bitmap.h

files modified:
drizzled/cursor.cc

drizzled/cursor.h

drizzled/definitions.h

drizzled/field.h

drizzled/filesort.cc

drizzled/function/math/round.cc

drizzled/function/time/weekday.cc

drizzled/include.am

drizzled/item.h

drizzled/item/cache.h

drizzled/item/field.cc

drizzled/item/int.h

drizzled/item/subselect.h

drizzled/key.cc

drizzled/key.h

drizzled/nested_join.h

drizzled/optimizer/quick_index_merge_select.cc

drizzled/optimizer/quick_index_merge_select.h

drizzled/optimizer/quick_range_select.cc

drizzled/optimizer/quick_range_select.h

drizzled/optimizer/quick_ror_intersect_select.cc

drizzled/optimizer/quick_ror_intersect_select.h

drizzled/optimizer/quick_ror_union_select.cc

drizzled/optimizer/quick_ror_union_select.h

drizzled/optimizer/range.cc

drizzled/optimizer/range.h

drizzled/optimizer/range_param.h

drizzled/optimizer/sel_arg.cc

drizzled/optimizer/sel_tree.h

drizzled/optimizer/table_read_plan.h

drizzled/order.h

drizzled/sql_base.cc

drizzled/sql_insert.cc

drizzled/sql_update.cc

drizzled/table.cc

drizzled/table.h

drizzled/table_reference.h

drizzled/table_share.cc

drizzled/table_share.h

plugin/pbms/src/compactor_ms.cc

plugin/pbms/src/connection_handler_ms.cc

plugin/pbms/src/connection_handler_ms.h

plugin/pbms/src/database_ms.h

plugin/pbms/src/defs_ms.h

plugin/pbms/src/engine_ms.h

plugin/pbms/src/network_ms.cc

plugin/pbms/src/network_ms.h

plugin/pbms/src/open_table_ms.cc

plugin/pbms/src/open_table_ms.h

plugin/pbms/src/table_ms.cc

plugin/pbms/src/temp_log_ms.cc

plugin/pbms/src/temp_log_ms.h

plugin/pbms/src/transaction_ms.cc

plugin/pbxt/src/ha_pbxt.cc

plugin/pbxt/src/index_xt.h

plugin/pbxt/src/myxt_xt.cc

plugin/pbxt/src/xt_defs.h

plugin/pbxt/tests/t/basic_auto_increment.test

plugin/pbxt/tests/t/basic_create_nullable.test

plugin/pbxt/tests/t/basic_create_select.test

plugin/pbxt/tests/t/basic_create_table.test

plugin/pbxt/tests/t/basic_create_with_index.test

plugin/pbxt/tests/t/basic_delete_all_rows.test

plugin/pbxt/tests/t/basic_delete_row.test

plugin/pbxt/tests/t/basic_drop_table.test

plugin/pbxt/tests/t/basic_index_lookup.test

plugin/pbxt/tests/t/basic_innodb_truncate_table.test

plugin/pbxt/tests/t/basic_insert.test

plugin/pbxt/tests/t/basic_insert_multi_column.test

plugin/pbxt/tests/t/basic_insert_pkey_duplicate.test

plugin/pbxt/tests/t/basic_pkey_index_reverse_scan.test

plugin/pbxt/tests/t/basic_pkey_index_scan.test

plugin/pbxt/tests/t/basic_rename_table.test

plugin/pbxt/tests/t/basic_select.test

plugin/pbxt/tests/t/basic_select_multirow.test

plugin/pbxt/tests/t/basic_show_tables.test

plugin/pbxt/tests/t/basic_transaction.test

plugin/pbxt/tests/t/basic_transaction_autocommit.test

plugin/pbxt/tests/t/basic_transaction_rollback.test

plugin/pbxt/tests/t/basic_type_decimal.test

plugin/pbxt/tests/t/basic_update.test

plugin/pbxt/tests/t/basic_with_indexes.test

plugin/pbxt/tests/t/master.opt

plugin/utility_dictionary/environmental.cc

plugin/utility_dictionary/tests/r/environmental.result

tests/test-run.pl

Show diffs side-by-side

added added

removed removed

drizzled/cursor.cc

drizzled/cursor.h

drizzled/definitions.h

drizzled/field.h

drizzled/filesort.cc

drizzled/function/math/round.cc

drizzled/function/time/weekday.cc

drizzled/include.am

drizzled/item.h

drizzled/item/cache.h

drizzled/item/field.cc

drizzled/item/int.h

drizzled/item/subselect.h

drizzled/key.cc

drizzled/nested_join.h

drizzled/optimizer/quick_index_merge_select.cc

drizzled/optimizer/quick_index_merge_select.h

drizzled/optimizer/quick_range_select.cc

drizzled/optimizer/quick_range_select.h

drizzled/optimizer/quick_ror_intersect_select.cc

drizzled/optimizer/quick_ror_intersect_select.h

drizzled/optimizer/quick_ror_union_select.cc

drizzled/optimizer/quick_ror_union_select.h

drizzled/optimizer/range.cc

drizzled/optimizer/range.h

drizzled/optimizer/range_param.h

drizzled/optimizer/sel_arg.cc

drizzled/optimizer/sel_tree.h

drizzled/optimizer/table_read_plan.h

drizzled/order.h

drizzled/sql_base.cc

drizzled/sql_bitmap.cc

drizzled/sql_bitmap.h

drizzled/sql_insert.cc

drizzled/sql_update.cc

drizzled/table.cc

drizzled/table.h

drizzled/table_reference.h

drizzled/table_share.cc

drizzled/table_share.h

plugin/pbms/src/compactor_ms.cc

plugin/pbms/src/connection_handler_ms.cc

plugin/pbms/src/connection_handler_ms.h

plugin/pbms/src/database_ms.h

plugin/pbms/src/defs_ms.h

plugin/pbms/src/engine_ms.h

plugin/pbms/src/network_ms.cc

plugin/pbms/src/network_ms.h

plugin/pbms/src/open_table_ms.cc

plugin/pbms/src/open_table_ms.h

plugin/pbms/src/table_ms.cc

plugin/pbms/src/temp_log_ms.cc

plugin/pbms/src/temp_log_ms.h

plugin/pbms/src/transaction_ms.cc

plugin/pbxt/src/ha_pbxt.cc

plugin/pbxt/src/index_xt.h

plugin/pbxt/src/myxt_xt.cc

plugin/pbxt/src/xt_defs.h

plugin/pbxt/tests/t/basic_auto_increment.test

plugin/pbxt/tests/t/basic_create_nullable.test

plugin/pbxt/tests/t/basic_create_select.test

plugin/pbxt/tests/t/basic_create_table.test

plugin/pbxt/tests/t/basic_create_with_index.test

plugin/pbxt/tests/t/basic_delete_all_rows.test

plugin/pbxt/tests/t/basic_delete_row.test

plugin/pbxt/tests/t/basic_drop_table.test

plugin/pbxt/tests/t/basic_index_lookup.test

plugin/pbxt/tests/t/basic_innodb_truncate_table.test

plugin/pbxt/tests/t/basic_insert.test

plugin/pbxt/tests/t/basic_insert_multi_column.test

plugin/pbxt/tests/t/basic_insert_pkey_duplicate.test

plugin/pbxt/tests/t/basic_pkey_index_reverse_scan.test

plugin/pbxt/tests/t/basic_pkey_index_scan.test

plugin/pbxt/tests/t/basic_rename_table.test

plugin/pbxt/tests/t/basic_select.test

plugin/pbxt/tests/t/basic_select_multirow.test

plugin/pbxt/tests/t/basic_show_tables.test

plugin/pbxt/tests/t/basic_transaction.test

plugin/pbxt/tests/t/basic_transaction_autocommit.test

plugin/pbxt/tests/t/basic_transaction_rollback.test

plugin/pbxt/tests/t/basic_type_decimal.test

plugin/pbxt/tests/t/basic_update.test

plugin/pbxt/tests/t/basic_with_indexes.test

plugin/pbxt/tests/t/master.opt

plugin/utility_dictionary/environmental.cc

plugin/utility_dictionary/tests/r/environmental.result

tests/include/have_valgrind.inc

tests/r/have_valgrind.require

tests/test-run.pl

Older »