← Back to branch summary

~mordred/drizzle/drizzled-as-lib

~mordred/drizzle/drizzled-as-lib

Viewing all changes in revision 1475.

Committer: Monty Taylor
Date: 2010-04-16 23:10:22 UTC
mfrom: (1471.1.4 bad-staging)
Revision ID: mordred@inaugust.com-20100416231022-xf1iiuuuw1kka2bb

Merged trunk.

files added:
plugin/embedded_innodb/config_table_function.cc

plugin/embedded_innodb/config_table_function.h

plugin/embedded_innodb/status_table_function.cc

plugin/embedded_innodb/status_table_function.h

plugin/embedded_innodb/tests/r/basic_rename_table.result

plugin/embedded_innodb/tests/r/basic_update.result

plugin/embedded_innodb/tests/r/config_table_function.result

plugin/embedded_innodb/tests/r/cursor_position.result

plugin/embedded_innodb/tests/r/index_multicolumn_unique.result

plugin/embedded_innodb/tests/r/index_null.result

plugin/embedded_innodb/tests/r/index_varchar.result

plugin/embedded_innodb/tests/r/rename.result

plugin/embedded_innodb/tests/r/rnd_pos.result

plugin/embedded_innodb/tests/r/secondary_index_scan.result

plugin/embedded_innodb/tests/r/status_table_function.result

plugin/embedded_innodb/tests/t/basic_rename_table-master.opt

plugin/embedded_innodb/tests/t/basic_rename_table.test

plugin/embedded_innodb/tests/t/basic_update-master.opt

plugin/embedded_innodb/tests/t/basic_update.test

plugin/embedded_innodb/tests/t/config_table_function-master.opt

plugin/embedded_innodb/tests/t/config_table_function.test

plugin/embedded_innodb/tests/t/cursor_position-master.opt

plugin/embedded_innodb/tests/t/cursor_position.test

plugin/embedded_innodb/tests/t/index_multicolumn_unique-master.opt

plugin/embedded_innodb/tests/t/index_multicolumn_unique.test

plugin/embedded_innodb/tests/t/index_null-master.opt

plugin/embedded_innodb/tests/t/index_null.test

plugin/embedded_innodb/tests/t/index_varchar-master.opt

plugin/embedded_innodb/tests/t/index_varchar.test

plugin/embedded_innodb/tests/t/rename-master.opt

plugin/embedded_innodb/tests/t/rename.test

plugin/embedded_innodb/tests/t/rnd_pos-master.opt

plugin/embedded_innodb/tests/t/rnd_pos.test

plugin/embedded_innodb/tests/t/secondary_index_scan-master.opt

plugin/embedded_innodb/tests/t/secondary_index_scan.test

plugin/embedded_innodb/tests/t/status_table_function-master.opt

plugin/embedded_innodb/tests/t/status_table_function.test

files modified:
drizzled/cursor.h

drizzled/memory/root.cc

drizzled/memory/root.h

drizzled/table.h

plugin/embedded_innodb/embedded_innodb_engine.cc

plugin/embedded_innodb/embedded_innodb_engine.h

plugin/embedded_innodb/plugin.ini

plugin/embedded_innodb/tests/r/basic_create_nullable.result

plugin/embedded_innodb/tests/r/basic_create_table.result

plugin/embedded_innodb/tests/r/basic_drop_table.result

plugin/embedded_innodb/tests/r/basic_innodb_table_proto_table.result

plugin/embedded_innodb/tests/r/basic_insert.result

plugin/embedded_innodb/tests/r/basic_insert_multi_column.result

plugin/embedded_innodb/tests/r/basic_savepoint.result

plugin/embedded_innodb/tests/r/basic_select.result

plugin/embedded_innodb/tests/r/basic_select_multirow.result

plugin/embedded_innodb/tests/r/basic_show_tables.result

plugin/embedded_innodb/tests/r/basic_transaction.result

plugin/embedded_innodb/tests/r/basic_transaction_autocommit.result

plugin/embedded_innodb/tests/r/basic_transaction_rollback.result

plugin/embedded_innodb/tests/r/insert_null.result

plugin/embedded_innodb/tests/r/libinnodb_datadict_dump_func.result

plugin/embedded_innodb/tests/t/basic_create_nullable.test

plugin/embedded_innodb/tests/t/basic_create_table.test

plugin/embedded_innodb/tests/t/basic_drop_table.test

plugin/embedded_innodb/tests/t/basic_insert.test

plugin/embedded_innodb/tests/t/basic_insert_multi_column.test

plugin/embedded_innodb/tests/t/basic_savepoint.test

plugin/embedded_innodb/tests/t/basic_select.test

plugin/embedded_innodb/tests/t/basic_select_multirow.test

plugin/embedded_innodb/tests/t/basic_show_tables.test

plugin/embedded_innodb/tests/t/basic_transaction.test

plugin/embedded_innodb/tests/t/basic_transaction_autocommit.test

plugin/embedded_innodb/tests/t/basic_transaction_rollback.test

plugin/embedded_innodb/tests/t/insert_null.test

plugin/embedded_innodb/tests/t/libinnodb_datadict_dump_func.test

plugin/innobase/handler/ha_innodb.cc

plugin/innobase/handler/ha_innodb.h

tests/valgrind.supp

Show diffs side-by-side

added added

removed removed

drizzled/cursor.h

drizzled/memory/root.cc

drizzled/memory/root.h

drizzled/table.h

plugin/embedded_innodb/config_table_function.cc

plugin/embedded_innodb/config_table_function.h

plugin/embedded_innodb/embedded_innodb_engine.cc

plugin/embedded_innodb/embedded_innodb_engine.h

plugin/embedded_innodb/plugin.ini

plugin/embedded_innodb/status_table_function.cc

plugin/embedded_innodb/status_table_function.h

plugin/embedded_innodb/tests/r/basic_create_nullable.result

plugin/embedded_innodb/tests/r/basic_create_table.result

plugin/embedded_innodb/tests/r/basic_drop_table.result

plugin/embedded_innodb/tests/r/basic_innodb_table_proto_table.result

plugin/embedded_innodb/tests/r/basic_insert.result

plugin/embedded_innodb/tests/r/basic_insert_multi_column.result

plugin/embedded_innodb/tests/r/basic_rename_table.result

plugin/embedded_innodb/tests/r/basic_savepoint.result

plugin/embedded_innodb/tests/r/basic_select.result

plugin/embedded_innodb/tests/r/basic_select_multirow.result

plugin/embedded_innodb/tests/r/basic_show_tables.result

plugin/embedded_innodb/tests/r/basic_transaction.result

plugin/embedded_innodb/tests/r/basic_transaction_autocommit.result

plugin/embedded_innodb/tests/r/basic_transaction_rollback.result

plugin/embedded_innodb/tests/r/basic_update.result

plugin/embedded_innodb/tests/r/config_table_function.result

plugin/embedded_innodb/tests/r/cursor_position.result

plugin/embedded_innodb/tests/r/index_multicolumn_unique.result

plugin/embedded_innodb/tests/r/index_null.result

plugin/embedded_innodb/tests/r/index_varchar.result

plugin/embedded_innodb/tests/r/insert_null.result

plugin/embedded_innodb/tests/r/libinnodb_datadict_dump_func.result

plugin/embedded_innodb/tests/r/rename.result

plugin/embedded_innodb/tests/r/rnd_pos.result

plugin/embedded_innodb/tests/r/secondary_index_scan.result

plugin/embedded_innodb/tests/r/status_table_function.result

plugin/embedded_innodb/tests/t/basic_create_nullable.test

plugin/embedded_innodb/tests/t/basic_create_table.test

plugin/embedded_innodb/tests/t/basic_drop_table.test

plugin/embedded_innodb/tests/t/basic_insert.test

plugin/embedded_innodb/tests/t/basic_insert_multi_column.test

plugin/embedded_innodb/tests/t/basic_rename_table-master.opt

plugin/embedded_innodb/tests/t/basic_rename_table.test

plugin/embedded_innodb/tests/t/basic_savepoint.test

plugin/embedded_innodb/tests/t/basic_select.test

plugin/embedded_innodb/tests/t/basic_select_multirow.test

plugin/embedded_innodb/tests/t/basic_show_tables.test

plugin/embedded_innodb/tests/t/basic_transaction.test

plugin/embedded_innodb/tests/t/basic_transaction_autocommit.test

plugin/embedded_innodb/tests/t/basic_transaction_rollback.test

plugin/embedded_innodb/tests/t/basic_update-master.opt

plugin/embedded_innodb/tests/t/basic_update.test

plugin/embedded_innodb/tests/t/config_table_function-master.opt

plugin/embedded_innodb/tests/t/config_table_function.test

plugin/embedded_innodb/tests/t/cursor_position-master.opt

plugin/embedded_innodb/tests/t/cursor_position.test

plugin/embedded_innodb/tests/t/index_multicolumn_unique-master.opt

plugin/embedded_innodb/tests/t/index_multicolumn_unique.test

plugin/embedded_innodb/tests/t/index_null-master.opt

plugin/embedded_innodb/tests/t/index_null.test

plugin/embedded_innodb/tests/t/index_varchar-master.opt

plugin/embedded_innodb/tests/t/index_varchar.test

plugin/embedded_innodb/tests/t/insert_null.test

plugin/embedded_innodb/tests/t/libinnodb_datadict_dump_func.test

plugin/embedded_innodb/tests/t/rename-master.opt

plugin/embedded_innodb/tests/t/rename.test

plugin/embedded_innodb/tests/t/rnd_pos-master.opt

plugin/embedded_innodb/tests/t/rnd_pos.test

plugin/embedded_innodb/tests/t/secondary_index_scan-master.opt

plugin/embedded_innodb/tests/t/secondary_index_scan.test

plugin/embedded_innodb/tests/t/status_table_function-master.opt

plugin/embedded_innodb/tests/t/status_table_function.test

plugin/innobase/handler/ha_innodb.cc

plugin/innobase/handler/ha_innodb.h

tests/valgrind.supp

Older »