← Back to branch summary

~linuxjedi/drizzle/trunk-bug-689448

~linuxjedi/drizzle/trunk-bug-689448

Viewing all changes in revision 1999.

Committer: Brian Aker
Date: 2010-12-16 04:01:22 UTC
mfrom: (1996.2.1 compare)
Revision ID: brian@tangent.org-20101216040122-eodh5shwsij35ybe

Merge in uuid tree.

files added:
drizzled/field/uuid.cc

drizzled/field/uuid.h

drizzled/field/uuid_st.h

plugin/archive/tests/r/uuid_type.result

plugin/archive/tests/t/uuid_type.test

plugin/csv/tests/r/uuid_type.result

plugin/csv/tests/t/uuid_type.test

plugin/memory/tests/r/primary_key.result

plugin/memory/tests/r/uuid_type.result

plugin/memory/tests/t/primary_key.test

plugin/memory/tests/t/uuid_type.test

tests/suite/uuid_type

tests/suite/uuid_type/r

tests/suite/uuid_type/r/alter_add_uuid.result

tests/suite/uuid_type/r/bad_conversions.result

tests/suite/uuid_type/r/create.result

tests/suite/uuid_type/r/create_with_defaults_on_update.result

tests/suite/uuid_type/r/function.result

tests/suite/uuid_type/r/insert_null_no_key.result

tests/suite/uuid_type/r/mixed.result

tests/suite/uuid_type/r/null.result

tests/suite/uuid_type/r/primary_key.result

tests/suite/uuid_type/r/select_like_no_key.result

tests/suite/uuid_type/t

tests/suite/uuid_type/t/alter_add_uuid.test

tests/suite/uuid_type/t/bad_conversions.test

tests/suite/uuid_type/t/create.test

tests/suite/uuid_type/t/function.test

tests/suite/uuid_type/t/insert_null_no_key.test

tests/suite/uuid_type/t/mixed.test

tests/suite/uuid_type/t/null.test

tests/suite/uuid_type/t/primary_key.test

tests/suite/uuid_type/t/select_like_no_key.test

files modified:
.bzrignore

drizzled/cached_item.cc

drizzled/common.h

drizzled/create_field.cc

drizzled/definition/table.cc

drizzled/display.cc

drizzled/display.h

drizzled/enum.h

drizzled/error.cc

drizzled/field.cc

drizzled/field.h

drizzled/field/enum.cc

drizzled/field_conv.cc

drizzled/filesort.cc

drizzled/function/set_user_var.cc

drizzled/include.am

drizzled/item.cc

drizzled/item.h

drizzled/item/field.cc

drizzled/item/ident.cc

drizzled/item/sum.cc

drizzled/join.cc

drizzled/key.cc

drizzled/message.cc

drizzled/message/statement_transform.cc

drizzled/message/table.proto

drizzled/sql_select.cc

drizzled/sql_yacc.yy

drizzled/symbol_hash.gperf

drizzled/transaction_services.cc

plugin/archive/ha_archive.cc

plugin/console/console.cc

plugin/csv/ha_tina.cc

plugin/filesystem_engine/filesystem_engine.cc

plugin/haildb/haildb_engine.cc

plugin/innobase/handler/ha_innodb.cc

plugin/innobase/tests/r/parser_bug21114_innodb.result

plugin/innobase/tests/t/parser_bug21114_innodb.test

plugin/mysql_protocol/mysql_protocol.cc

plugin/pbms/src/system_table_ms.h

plugin/pbxt/src/ha_pbxt.cc

plugin/pbxt/src/myxt_xt.cc

plugin/uuid_function/uuid_function.cc

tests/r/create.result

tests/r/subselect2.result

tests/t/create.test

tests/t/subselect2.test

Show diffs side-by-side

added added

removed removed

drizzled/cached_item.cc

drizzled/common.h

drizzled/create_field.cc

drizzled/definition/table.cc

drizzled/display.cc

drizzled/display.h

drizzled/enum.h

drizzled/error.cc

drizzled/field.cc

drizzled/field.h

drizzled/field/enum.cc

drizzled/field/uuid.cc

drizzled/field/uuid.h

drizzled/field/uuid_st.h

drizzled/field_conv.cc

drizzled/filesort.cc

drizzled/function/set_user_var.cc

drizzled/include.am

drizzled/item.cc

drizzled/item.h

drizzled/item/field.cc

drizzled/item/ident.cc

drizzled/item/sum.cc

drizzled/join.cc

drizzled/key.cc

drizzled/message.cc

drizzled/message/statement_transform.cc

drizzled/message/table.proto

drizzled/sql_select.cc

drizzled/sql_yacc.yy

drizzled/symbol_hash.gperf

drizzled/transaction_services.cc

plugin/archive/ha_archive.cc

plugin/archive/tests/r/uuid_type.result

plugin/archive/tests/t/uuid_type.test

plugin/console/console.cc

plugin/csv/ha_tina.cc

plugin/csv/tests/r/uuid_type.result

plugin/csv/tests/t/uuid_type.test

plugin/filesystem_engine/filesystem_engine.cc

plugin/haildb/haildb_engine.cc

plugin/innobase/handler/ha_innodb.cc

plugin/innobase/tests/r/parser_bug21114_innodb.result

plugin/innobase/tests/t/parser_bug21114_innodb.test

plugin/memory/tests/r/primary_key.result

plugin/memory/tests/r/uuid_type.result

plugin/memory/tests/t/primary_key.test

plugin/memory/tests/t/uuid_type.test

plugin/mysql_protocol/mysql_protocol.cc

plugin/pbms/src/system_table_ms.h

plugin/pbxt/src/ha_pbxt.cc

plugin/pbxt/src/myxt_xt.cc

plugin/uuid_function/uuid_function.cc

tests/r/create.result

tests/r/subselect2.result

tests/suite/uuid_type/

tests/suite/uuid_type/r/

tests/suite/uuid_type/r/alter_add_uuid.result

tests/suite/uuid_type/r/bad_conversions.result

tests/suite/uuid_type/r/create.result

tests/suite/uuid_type/r/create_with_defaults_on_update.result

tests/suite/uuid_type/r/function.result

tests/suite/uuid_type/r/insert_null_no_key.result

tests/suite/uuid_type/r/mixed.result

tests/suite/uuid_type/r/null.result

tests/suite/uuid_type/r/primary_key.result

tests/suite/uuid_type/r/select_like_no_key.result

tests/suite/uuid_type/t/

tests/suite/uuid_type/t/alter_add_uuid.test

tests/suite/uuid_type/t/bad_conversions.test

tests/suite/uuid_type/t/create.test

tests/suite/uuid_type/t/function.test

tests/suite/uuid_type/t/insert_null_no_key.test

tests/suite/uuid_type/t/mixed.test

tests/suite/uuid_type/t/null.test

tests/suite/uuid_type/t/primary_key.test

tests/suite/uuid_type/t/select_like_no_key.test

tests/t/create.test

tests/t/subselect2.test

Older »