← Back to branch summary

~jaypipes/drizzle/bug534806

~jaypipes/drizzle/bug534806

Viewing all changes in revision 1319.

Committer: Brian Aker
Date: 2010-03-03 05:02:36 UTC
mfrom: (1309.2.19 build)
Revision ID: brian@gaz-20100303050236-y7dotibgwks12gyp

Merge.

files added:
plugin/transaction_log/tests/r/create_schema.result

plugin/transaction_log/tests/r/create_table.result

plugin/transaction_log/tests/r/multi_column_primary_key.result

plugin/transaction_log/tests/r/schema.result

plugin/transaction_log/tests/t/create_table-master.opt

plugin/transaction_log/tests/t/create_table.inc

plugin/transaction_log/tests/t/create_table.test

plugin/transaction_log/tests/t/multi_column_primary_key-master.opt

plugin/transaction_log/tests/t/multi_column_primary_key.inc

plugin/transaction_log/tests/t/multi_column_primary_key.test

plugin/transaction_log/tests/t/schema-master.opt

plugin/transaction_log/tests/t/schema.inc

plugin/transaction_log/tests/t/schema.test

files removed:
plugin/transaction_log/tests/t/database.inc

plugin/transaction_log/tests/t/database.test

files modified:
drizzled/cursor.cc

drizzled/db.cc

drizzled/drizzled.cc

drizzled/enum.h

drizzled/join.cc

drizzled/message/statement_transform.cc

drizzled/message/statement_transform.h

drizzled/message/table.proto

drizzled/message/table_reader.cc

drizzled/message/transaction.proto

drizzled/replication_services.cc

drizzled/replication_services.h

drizzled/sql_base.cc

drizzled/sql_base.h

drizzled/sql_insert.cc

drizzled/sql_table.cc

drizzled/statement/alter_table.cc

drizzled/statement/create_table.cc

drizzled/statement/rename_table.cc

drizzled/table.cc

drizzled/table_identifier.cc

drizzled/table_identifier.h

drizzled/table_proto_write.cc

drizzled/table_share.cc

drizzled/table_share.h

plugin/heap/ha_heap.cc

plugin/myisam/ha_myisam.cc

plugin/transaction_log/tests/r/alter.result

plugin/transaction_log/tests/r/auto_commit.result

plugin/transaction_log/tests/r/blob.result

plugin/transaction_log/tests/r/create_select.result

plugin/transaction_log/tests/r/database.result

plugin/transaction_log/tests/r/delete.result

plugin/transaction_log/tests/r/filtered_replicator.result

plugin/transaction_log/tests/r/insert.result

plugin/transaction_log/tests/r/insert_multi.result

plugin/transaction_log/tests/r/insert_on_duplicate_update.result

plugin/transaction_log/tests/r/insert_select.result

plugin/transaction_log/tests/r/no_modification.result

plugin/transaction_log/tests/r/no_primary_key.result

plugin/transaction_log/tests/r/rand.result

plugin/transaction_log/tests/r/rename.result

plugin/transaction_log/tests/r/replace.result

plugin/transaction_log/tests/r/rollback.result

plugin/transaction_log/tests/r/select_for_update.result

plugin/transaction_log/tests/r/temp_tables.result

plugin/transaction_log/tests/r/truncate.result

plugin/transaction_log/tests/r/truncate_log.result

plugin/transaction_log/tests/r/update.result

plugin/transaction_log/tests/t/filtered_replicator.test

tests/r/drop.result

tests/r/innodb.result

tests/r/mix2_myisam.result

tests/r/myisam.result

tests/t/drop.test

Show diffs side-by-side

added added

removed removed

drizzled/cursor.cc

drizzled/drizzled.cc

drizzled/enum.h

drizzled/join.cc

drizzled/message/statement_transform.cc

drizzled/message/statement_transform.h

drizzled/message/table.proto

drizzled/message/table_reader.cc

drizzled/message/transaction.proto

drizzled/replication_services.cc

drizzled/replication_services.h

drizzled/sql_base.cc

drizzled/sql_base.h

drizzled/sql_insert.cc

drizzled/sql_table.cc

drizzled/statement/alter_table.cc

drizzled/statement/create_table.cc

drizzled/statement/rename_table.cc

drizzled/table.cc

drizzled/table_identifier.cc

drizzled/table_identifier.h

drizzled/table_proto_write.cc

drizzled/table_share.cc

drizzled/table_share.h

plugin/heap/ha_heap.cc

plugin/myisam/ha_myisam.cc

plugin/transaction_log/tests/r/alter.result

plugin/transaction_log/tests/r/auto_commit.result

plugin/transaction_log/tests/r/blob.result

plugin/transaction_log/tests/r/create_schema.result

plugin/transaction_log/tests/r/create_select.result

plugin/transaction_log/tests/r/create_table.result

plugin/transaction_log/tests/r/database.result

plugin/transaction_log/tests/r/delete.result

plugin/transaction_log/tests/r/filtered_replicator.result

plugin/transaction_log/tests/r/insert.result

plugin/transaction_log/tests/r/insert_multi.result

plugin/transaction_log/tests/r/insert_on_duplicate_update.result

plugin/transaction_log/tests/r/insert_select.result

plugin/transaction_log/tests/r/multi_column_primary_key.result

plugin/transaction_log/tests/r/no_modification.result

plugin/transaction_log/tests/r/no_primary_key.result

plugin/transaction_log/tests/r/rand.result

plugin/transaction_log/tests/r/rename.result

plugin/transaction_log/tests/r/replace.result

plugin/transaction_log/tests/r/rollback.result

plugin/transaction_log/tests/r/schema.result

plugin/transaction_log/tests/r/select_for_update.result

plugin/transaction_log/tests/r/temp_tables.result

plugin/transaction_log/tests/r/truncate.result

plugin/transaction_log/tests/r/truncate_log.result

plugin/transaction_log/tests/r/update.result

plugin/transaction_log/tests/t/create_table-master.opt

plugin/transaction_log/tests/t/create_table.inc

plugin/transaction_log/tests/t/create_table.test

plugin/transaction_log/tests/t/database.inc

plugin/transaction_log/tests/t/database.test

plugin/transaction_log/tests/t/filtered_replicator.test

plugin/transaction_log/tests/t/multi_column_primary_key-master.opt

plugin/transaction_log/tests/t/multi_column_primary_key.inc

plugin/transaction_log/tests/t/multi_column_primary_key.test

plugin/transaction_log/tests/t/schema-master.opt

plugin/transaction_log/tests/t/schema.inc

plugin/transaction_log/tests/t/schema.test

tests/r/drop.result

tests/r/innodb.result

tests/r/mix2_myisam.result

tests/r/myisam.result

tests/t/drop.test

Older »