Merge lp:~stewart/drizzle/kill-HAS_DOES_TRANSACTIONS into lp:drizzle

Proposed by Stewart Smith
Status: Merged
Merged at revision: 2621
Proposed branch: lp:~stewart/drizzle/kill-HAS_DOES_TRANSACTIONS
Merge into: lp:drizzle
Diff against target: 60 lines (+3/-7)
4 files modified
drizzled/cursor.cc (+1/-1)
drizzled/plugin/storage_engine.h (+0/-2)
plugin/innobase/handler/ha_innodb.cc (+1/-2)
plugin/storage_engine_api_tester/storage_engine_api_tester.cc (+1/-2)
To merge this branch: bzr merge lp:~stewart/drizzle/kill-HAS_DOES_TRANSACTIONS
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Drizzle Trunk Pending
Review via email: mp+149947@code.launchpad.net

Description of the change

We don't need this HTON bit anymore, we can interrogate the actual class.

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

Brian acked via private mail.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/cursor.cc'
2--- drizzled/cursor.cc 2013-01-29 13:10:03 +0000
3+++ drizzled/cursor.cc 2013-02-21 22:37:21 +0000
4@@ -175,7 +175,7 @@
5
6 bool Cursor::has_transactions()
7 {
8- return (getTable()->getShare()->db_type()->check_flag(HTON_BIT_DOES_TRANSACTIONS));
9+ return (getEngine()->participatesInSqlTransaction());
10 }
11
12 void Cursor::ha_statistic_increment(uint64_t system_status_var::*offset) const
13
14=== modified file 'drizzled/plugin/storage_engine.h'
15--- drizzled/plugin/storage_engine.h 2011-07-15 08:26:31 +0000
16+++ drizzled/plugin/storage_engine.h 2013-02-21 22:37:21 +0000
17@@ -51,7 +51,6 @@
18 HTON_BIT_NOT_USER_SELECTABLE,
19 HTON_BIT_TEMPORARY_NOT_SUPPORTED, // Having temporary tables not supported
20 HTON_BIT_TEMPORARY_ONLY,
21- HTON_BIT_DOES_TRANSACTIONS,
22 HTON_BIT_STATS_RECORDS_IS_EXACT,
23 HTON_BIT_NULL_IN_KEY,
24 HTON_BIT_CAN_INDEX_BLOBS,
25@@ -81,7 +80,6 @@
26 static const std::bitset<HTON_BIT_SIZE> HTON_NOT_USER_SELECTABLE(1 << HTON_BIT_NOT_USER_SELECTABLE);
27 static const std::bitset<HTON_BIT_SIZE> HTON_TEMPORARY_NOT_SUPPORTED(1 << HTON_BIT_TEMPORARY_NOT_SUPPORTED);
28 static const std::bitset<HTON_BIT_SIZE> HTON_TEMPORARY_ONLY(1 << HTON_BIT_TEMPORARY_ONLY);
29-static const std::bitset<HTON_BIT_SIZE> HTON_HAS_DOES_TRANSACTIONS(1 << HTON_BIT_DOES_TRANSACTIONS);
30 static const std::bitset<HTON_BIT_SIZE> HTON_STATS_RECORDS_IS_EXACT(1 << HTON_BIT_STATS_RECORDS_IS_EXACT);
31 static const std::bitset<HTON_BIT_SIZE> HTON_NULL_IN_KEY(1 << HTON_BIT_NULL_IN_KEY);
32 static const std::bitset<HTON_BIT_SIZE> HTON_CAN_INDEX_BLOBS(1 << HTON_BIT_CAN_INDEX_BLOBS);
33
34=== modified file 'plugin/innobase/handler/ha_innodb.cc'
35--- plugin/innobase/handler/ha_innodb.cc 2012-10-20 23:08:23 +0000
36+++ plugin/innobase/handler/ha_innodb.cc 2013-02-21 22:37:21 +0000
37@@ -395,8 +395,7 @@
38 HTON_PRIMARY_KEY_IN_READ_INDEX |
39 HTON_PARTIAL_COLUMN_READ |
40 HTON_TABLE_SCAN_ON_INDEX |
41- HTON_HAS_FOREIGN_KEYS |
42- HTON_HAS_DOES_TRANSACTIONS)
43+ HTON_HAS_FOREIGN_KEYS)
44 {
45 table_definition_ext= plugin::DEFAULT_DEFINITION_FILE_EXT;
46 addAlias("INNOBASE");
47
48=== modified file 'plugin/storage_engine_api_tester/storage_engine_api_tester.cc'
49--- plugin/storage_engine_api_tester/storage_engine_api_tester.cc 2012-01-15 20:54:59 +0000
50+++ plugin/storage_engine_api_tester/storage_engine_api_tester.cc 2013-02-21 22:37:21 +0000
51@@ -492,8 +492,7 @@
52 HTON_PRIMARY_KEY_IN_READ_INDEX |
53 HTON_PARTIAL_COLUMN_READ |
54 HTON_TABLE_SCAN_ON_INDEX |
55- HTON_HAS_FOREIGN_KEYS |
56- HTON_HAS_DOES_TRANSACTIONS)
57+ HTON_HAS_FOREIGN_KEYS)
58 {
59 ENGINE_NEW_STATE("::SEAPITester()");
60 }

Subscribers

People subscribed via source and target branches

to all changes: