Drizzle

Merge lp:~paul-mccullagh/drizzle/pbxt-bug-641038 into lp:~drizzle-trunk/drizzle/development

  1. pbxt-bug-641038
  2. Merge into development
Proposed by Paul McCullagh
Status: Merged
Approved by: Monty Taylor
Approved revision: 1782
Merged at revision: 1785
Proposed branch: lp:~paul-mccullagh/drizzle/pbxt-bug-641038
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 14 lines (+3/-1)
1 file modified
plugin/pbxt/src/ha_pbxt.h (+3/-1)
To merge this branch: bzr merge lp:~paul-mccullagh/drizzle/pbxt-bug-641038
Reviewer Review Type Date Requested Status
Monty Taylor Approve
Stewart Smith (community) Approve
Review via email: mp+36138@code.launchpad.net

Description of the change

This patch fixes bug #641038.

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) wrote :

even better if included "bzr mv plugin/pbxt/tests/t/basic_transaction_rollback.test.disabled plugin/pbxt/tests/t/basic_transaction_rollback.test"

review: Approve
Revision history for this message
Monty Taylor (mordred) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/pbxt/src/ha_pbxt.h'
2--- plugin/pbxt/src/ha_pbxt.h 2010-09-13 22:31:32 +0000
3+++ plugin/pbxt/src/ha_pbxt.h 2010-09-21 12:26:16 +0000
4@@ -68,7 +68,9 @@
5 HTON_FAST_KEY_READ |
6 HTON_NULL_IN_KEY |
7 HTON_CAN_INDEX_BLOBS |
8- HTON_AUTO_PART_KEY)
9+ HTON_AUTO_PART_KEY |
10+ HTON_HAS_FOREIGN_KEYS |
11+ HTON_HAS_DOES_TRANSACTIONS)
12 {}
13
14 void operator delete(void *) {}