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

[Stewart Smith]

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

[Stewart Smith (stewart)]

Brian acked via private mail.

review: Approve

=== modified file 'drizzled/cursor.cc'
--- drizzled/cursor.cc	2013-01-29 13:10:03 +0000
+++ drizzled/cursor.cc	2013-02-21 22:37:21 +0000
@@ -175,7 +175,7 @@
 
 bool Cursor::has_transactions()
 {
-  return (getTable()->getShare()->db_type()->check_flag(HTON_BIT_DOES_TRANSACTIONS));
+  return (getEngine()->participatesInSqlTransaction());
 }
 
 void Cursor::ha_statistic_increment(uint64_t system_status_var::*offset) const
 
=== modified file 'drizzled/plugin/storage_engine.h'
--- drizzled/plugin/storage_engine.h	2011-07-15 08:26:31 +0000
+++ drizzled/plugin/storage_engine.h	2013-02-21 22:37:21 +0000
@@ -51,7 +51,6 @@
   HTON_BIT_NOT_USER_SELECTABLE,
   HTON_BIT_TEMPORARY_NOT_SUPPORTED,   // Having temporary tables not supported
   HTON_BIT_TEMPORARY_ONLY,
-  HTON_BIT_DOES_TRANSACTIONS,
   HTON_BIT_STATS_RECORDS_IS_EXACT,
   HTON_BIT_NULL_IN_KEY,
   HTON_BIT_CAN_INDEX_BLOBS,
@@ -81,7 +80,6 @@
 static const std::bitset<HTON_BIT_SIZE> HTON_NOT_USER_SELECTABLE(1 << HTON_BIT_NOT_USER_SELECTABLE);
 static const std::bitset<HTON_BIT_SIZE> HTON_TEMPORARY_NOT_SUPPORTED(1 << HTON_BIT_TEMPORARY_NOT_SUPPORTED);
 static const std::bitset<HTON_BIT_SIZE> HTON_TEMPORARY_ONLY(1 << HTON_BIT_TEMPORARY_ONLY);
-static const std::bitset<HTON_BIT_SIZE> HTON_HAS_DOES_TRANSACTIONS(1 << HTON_BIT_DOES_TRANSACTIONS);
 static const std::bitset<HTON_BIT_SIZE> HTON_STATS_RECORDS_IS_EXACT(1 << HTON_BIT_STATS_RECORDS_IS_EXACT);
 static const std::bitset<HTON_BIT_SIZE> HTON_NULL_IN_KEY(1 << HTON_BIT_NULL_IN_KEY);
 static const std::bitset<HTON_BIT_SIZE> HTON_CAN_INDEX_BLOBS(1 << HTON_BIT_CAN_INDEX_BLOBS);
 
=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2012-10-20 23:08:23 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2013-02-21 22:37:21 +0000
@@ -395,8 +395,7 @@
                             HTON_PRIMARY_KEY_IN_READ_INDEX |
                             HTON_PARTIAL_COLUMN_READ |
                             HTON_TABLE_SCAN_ON_INDEX |
-                            HTON_HAS_FOREIGN_KEYS |
-                            HTON_HAS_DOES_TRANSACTIONS)
+                            HTON_HAS_FOREIGN_KEYS)
   {
     table_definition_ext= plugin::DEFAULT_DEFINITION_FILE_EXT;
     addAlias("INNOBASE");
 
=== modified file 'plugin/storage_engine_api_tester/storage_engine_api_tester.cc'
--- plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2012-01-15 20:54:59 +0000
+++ plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2013-02-21 22:37:21 +0000
@@ -492,8 +492,7 @@
                             HTON_PRIMARY_KEY_IN_READ_INDEX |
                             HTON_PARTIAL_COLUMN_READ |
                             HTON_TABLE_SCAN_ON_INDEX |
-                            HTON_HAS_FOREIGN_KEYS |
-                            HTON_HAS_DOES_TRANSACTIONS)
+                            HTON_HAS_FOREIGN_KEYS)
   {
     ENGINE_NEW_STATE("::SEAPITester()");
   }