← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

Viewing all changes in revision 2144.

Committer: Brian Aker
Date: 2011-02-04 10:18:35 UTC
mfrom: (2143.1.4 drizzle-build)
Revision ID: brian@tangent.org-20110204101835-j23pv0febg9p0a2p

Merge of all local trees.

files added:
drizzled/data_home.cc

files modified:
drizzled/data_home.h

drizzled/drizzled.cc

drizzled/error.cc

drizzled/error/sql_state.cc

drizzled/error_t.h

drizzled/field/decimal.cc

drizzled/field/num.cc

drizzled/field/str.cc

drizzled/function/math/decimal_typecast.cc

drizzled/function/min_max.cc

drizzled/function/numhybrid.cc

drizzled/hybrid_type_traits_decimal.cc

drizzled/identifier/table.cc

drizzled/identifier/table.h

drizzled/include.am

drizzled/item.cc

drizzled/item/cache_decimal.cc

drizzled/item/decimal.cc

drizzled/item/sum.cc

drizzled/main.cc

drizzled/plugin/storage_engine.cc

drizzled/show.cc

drizzled/sql_base.cc

drizzled/statement/rename_table.cc

drizzled/table/instance/base.cc

drizzled/table/instance/base.h

drizzled/table/instance/shared.cc

drizzled/table/instance/shared.h

drizzled/type/decimal.cc

drizzled/type/decimal.h

drizzled/user_var_entry.cc

plugin/archive/tests/r/discover.result

plugin/archive/tests/t/discover.test

plugin/blitzdb/plugin.ini

plugin/haildb/tests/t/alter_table.test

plugin/haildb/tests/t/rename.test

plugin/haildb/tests/t/truncate.test

plugin/innobase/handler/data_dictionary.cc

plugin/innobase/handler/ha_innodb.cc

plugin/innobase/include/ha_prototypes.h

plugin/innobase/include/trx0trx.h

plugin/simple_user_policy/tests/r/basic.result

plugin/simple_user_policy/tests/t/basic.test

plugin/storage_engine_api_tester/tests/r/transaction.result

plugin/storage_engine_api_tester/tests/t/select.test

plugin/string_functions/format.cc

tests/r/alter_table.result

tests/r/create.result

tests/r/create_select_tmp.result

tests/r/drizzledump.result

tests/r/drizzledump_restore.result

tests/r/errors.result

tests/r/rename.result

tests/r/savepoints.result

tests/r/show_check.result

tests/r/subselect.result

tests/r/temp_table.result

tests/r/transaction.result

tests/r/truncate.result

tests/r/union.result

tests/suite/execute/r/transaction.result

tests/suite/regression/r/674719.result

tests/suite/regression/r/682563.result

tests/t/alter_table.test

tests/t/create.test

tests/t/create_select_tmp.test

tests/t/drizzledump_restore.test

tests/t/errors.test

tests/t/rename.test

tests/t/show_check.test

tests/t/subselect.test

tests/t/temp_table.test

tests/t/truncate.test

tests/t/union.test

Show diffs side-by-side

added added

removed removed

drizzled/data_home.cc

drizzled/data_home.h

drizzled/drizzled.cc

drizzled/error.cc

drizzled/error/sql_state.cc

drizzled/error_t.h

drizzled/field/decimal.cc

drizzled/field/num.cc

drizzled/field/str.cc

drizzled/function/math/decimal_typecast.cc

drizzled/function/min_max.cc

drizzled/function/numhybrid.cc

drizzled/hybrid_type_traits_decimal.cc

drizzled/identifier/table.cc

drizzled/identifier/table.h

drizzled/include.am

drizzled/item.cc

drizzled/item/cache_decimal.cc

drizzled/item/decimal.cc

drizzled/item/sum.cc

drizzled/main.cc

drizzled/plugin/storage_engine.cc

drizzled/show.cc

drizzled/sql_base.cc

drizzled/statement/rename_table.cc

drizzled/table/instance/base.cc

drizzled/table/instance/base.h

drizzled/table/instance/shared.cc

drizzled/table/instance/shared.h

drizzled/type/decimal.cc

drizzled/type/decimal.h

drizzled/user_var_entry.cc

plugin/archive/tests/r/discover.result

plugin/archive/tests/t/discover.test

plugin/blitzdb/plugin.ini

plugin/haildb/tests/t/alter_table.test

plugin/haildb/tests/t/rename.test

plugin/haildb/tests/t/truncate.test

plugin/innobase/handler/data_dictionary.cc

plugin/innobase/handler/ha_innodb.cc

plugin/innobase/include/ha_prototypes.h

plugin/innobase/include/trx0trx.h

plugin/simple_user_policy/tests/r/basic.result

plugin/simple_user_policy/tests/t/basic.test

plugin/storage_engine_api_tester/tests/r/transaction.result

plugin/storage_engine_api_tester/tests/t/select.test

plugin/string_functions/format.cc

tests/r/alter_table.result

tests/r/create.result

tests/r/create_select_tmp.result

tests/r/drizzledump.result

tests/r/drizzledump_restore.result

tests/r/errors.result

tests/r/rename.result

tests/r/savepoints.result

tests/r/show_check.result

tests/r/subselect.result

tests/r/temp_table.result

tests/r/transaction.result

tests/r/truncate.result

tests/r/union.result

tests/suite/execute/r/transaction.result

tests/suite/regression/r/674719.result

tests/suite/regression/r/682563.result

tests/t/alter_table.test

tests/t/create.test

tests/t/create_select_tmp.test

tests/t/drizzledump_restore.test

tests/t/errors.test

tests/t/rename.test

tests/t/show_check.test

tests/t/subselect.test

tests/t/temp_table.test

tests/t/truncate.test

tests/t/union.test

Older »