Merge lp://staging/~stewart/drizzle/enhanced-storage-engine-api-patdown into lp://staging/drizzle/7.0
Proposed by
Stewart Smith
Status: | Merged |
---|---|
Approved by: | Lee Bieber |
Approved revision: | 1966 |
Merged at revision: | 2023 |
Proposed branch: | lp://staging/~stewart/drizzle/enhanced-storage-engine-api-patdown |
Merge into: | lp://staging/drizzle/7.0 |
Diff against target: |
1235 lines (+804/-138) 20 files modified
drizzled/cursor.h (+1/-0) drizzled/plugin/storage_engine.h (+2/-0) drizzled/plugin/transactional_storage_engine.h (+1/-0) plugin/storage_engine_api_tester/cursor_states.cc (+53/-6) plugin/storage_engine_api_tester/engine_states.cc (+28/-5) plugin/storage_engine_api_tester/storage_engine_api_tester.cc (+288/-127) plugin/storage_engine_api_tester/tests/r/multi_stmt_txn.result (+29/-0) plugin/storage_engine_api_tester/tests/r/rnd_pos.result (+28/-0) plugin/storage_engine_api_tester/tests/r/select.result (+1/-0) plugin/storage_engine_api_tester/tests/r/transaction.result (+43/-0) plugin/storage_engine_api_tester/tests/r/txn_log_insert.result (+44/-0) plugin/storage_engine_api_tester/tests/r/txn_log_rollback_large_stmt.result (+55/-0) plugin/storage_engine_api_tester/tests/t/multi_stmt_txn.test (+18/-0) plugin/storage_engine_api_tester/tests/t/rnd_pos.test (+48/-0) plugin/storage_engine_api_tester/tests/t/select.test (+1/-0) plugin/storage_engine_api_tester/tests/t/transaction.test (+56/-0) plugin/storage_engine_api_tester/tests/t/txn_log_insert-master.opt (+1/-0) plugin/storage_engine_api_tester/tests/t/txn_log_insert.test (+53/-0) plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt-master.opt (+1/-0) plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test (+53/-0) |
To merge this branch: | bzr merge lp://staging/~stewart/drizzle/enhanced-storage-engine-api-patdown |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Aker | Needs Fixing | ||
Review via email:
|
Description of the change
Contains everything from https:/
To post a comment you must log in.
32bit valgrind complained a bit about this tree.