refs #6094 remove HA_GENERAL_ONLINE code from the handlerton

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@53679 c7de825b-a66e-492c-adef-691d508d4ae1

4 files changed, 4 insertions, 67 deletions

diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc
index fa8d45c3204..f03a3b780f0 100644
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@@ -295,11 +295,7 @@ static inline uint get_ext_key_parts(const KEY *key) {
 ulonglong ha_tokudb::table_flags() const {
     return (table && do_ignore_flag_optimization(ha_thd(), table, share->replace_into_fast) ? 
         int_table_flags | HA_BINLOG_STMT_CAPABLE : 
-#if defined(HA_GENERAL_ONLINE)
-        int_table_flags | HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | HA_ONLINE_ALTER);
-#else
         int_table_flags | HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE);
-#endif
 }
 
 //
diff --git a/storage/tokudb/ha_tokudb.h b/storage/tokudb/ha_tokudb.h
index 284737e8b80..05badc2bb69 100644
--- a/storage/tokudb/ha_tokudb.h
+++ b/storage/tokudb/ha_tokudb.h
@@ -610,46 +610,6 @@ public:
     int new_alter_table_frm_data(const uchar *frm_data, size_t frm_len);
     bool try_hot_alter_table();
 #endif
-#if TOKU_INCLUDE_ALTER_51
- public:
-    int add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys);
-    int prepare_drop_index(TABLE *table_arg, uint *key_num, uint num_of_keys);
-    int final_drop_index(TABLE *table_arg);
-#endif
-
-#if defined(HA_GENERAL_ONLINE)
- private:
-    void print_alter_info(
-        TABLE *altered_table,
-        HA_CREATE_INFO *create_info,
-        HA_ALTER_FLAGS *alter_flags,
-        uint table_changes
-        );
- public:
-    int check_if_supported_alter(TABLE *altered_table,
-         HA_CREATE_INFO *create_info,
-         HA_ALTER_FLAGS *alter_flags,
-         HA_ALTER_INFO  *alter_info,
-         uint table_changes
-         );
-    int alter_table_phase1(THD *thd,
-                                   TABLE *altered_table,
-                                   HA_CREATE_INFO *create_info,
-                                   HA_ALTER_INFO *alter_info,
-                                   HA_ALTER_FLAGS *alter_flags)
-    {
-      return 0;
-    }
-    int alter_table_phase2(THD *thd,
-                                   TABLE *altered_table,
-                                   HA_CREATE_INFO *create_info,
-                                   HA_ALTER_INFO *alter_info,
-                                   HA_ALTER_FLAGS *alter_flags);
-    int alter_table_phase3(THD *thd, TABLE *table)
-    {
-      return 0;
-    }
-#endif
 
  private:
     int tokudb_add_index(
diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h
index 0d01cffc7d6..d3fd7de9173 100644
--- a/storage/tokudb/hatoku_defines.h
+++ b/storage/tokudb/hatoku_defines.h
@@ -60,14 +60,8 @@
 #define TOKU_INCLUDE_EXTENDED_KEYS 1
 #endif
 
-#elif 50100 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID < 50299
-#define TOKU_INCLUDE_ALTER_51 1
-#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
-#define TOKU_INCLUDE_XA 1
-#define TOKU_PARTITION_WRITE_FRM_DATA 0
-#define TOKU_INCLUDE_WRITE_FRM_DATA 0
-
 #else
+
 #error
 
 #endif
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index 0096cc2e131..e91c800ed1b 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -228,7 +228,7 @@ static int tokudb_commit_by_xid(handlerton* hton, XID* xid);
 static int tokudb_rollback_by_xid(handlerton* hton, XID*  xid);

 #endif

 

-#if defined(HA_GENERAL_ONLINE) || defined(HA_INPLACE_ADD_INDEX_NO_READ_WRITE)

+#if defined(HA_INPLACE_ADD_INDEX_NO_READ_WRITE)

 static uint tokudb_alter_table_flags(uint flags);

 #endif

 static int tokudb_rollback_to_savepoint(handlerton * hton, THD * thd, void *savepoint);

@@ -388,7 +388,7 @@ static int tokudb_init_func(void *p) {
     tokudb_hton->panic = tokudb_end;

     tokudb_hton->flush_logs = tokudb_flush_logs;

     tokudb_hton->show_status = tokudb_show_status;

-#if defined(HA_GENERAL_ONLINE) || defined(HA_INPLACE_ADD_INDEX_NO_READ_WRITE)

+#if defined(HA_INPLACE_ADD_INDEX_NO_READ_WRITE)

     tokudb_hton->alter_table_flags = tokudb_alter_table_flags;

 #endif

     if (!tokudb_home)

@@ -1766,20 +1766,7 @@ static void tokudb_cleanup_log_files(void) {
     DBUG_VOID_RETURN;

 }

 

-#if defined(HA_GENERAL_ONLINE)

-//

-// *******NOTE*****

-// If the flags HA_ONLINE_DROP_INDEX and HA_ONLINE_DROP_UNIQUE_INDEX

-// are ever added, prepare_drop_index and final_drop_index will need to be modified

-// so that the actual deletion of DB's is done in final_drop_index and not prepare_drop_index

-//

-static uint tokudb_alter_table_flags(uint flags)

-{

-    return (HA_ONLINE_ADD_INDEX_NO_WRITES| HA_ONLINE_DROP_INDEX_NO_WRITES |

-            HA_ONLINE_ADD_UNIQUE_INDEX_NO_WRITES| HA_ONLINE_DROP_UNIQUE_INDEX_NO_WRITES|HA_GENERAL_ONLINE);

-

-}

-#elif defined(HA_INPLACE_ADD_INDEX_NO_READ_WRITE)

+#if defined(HA_INPLACE_ADD_INDEX_NO_READ_WRITE)

 static uint tokudb_alter_table_flags(uint flags) {

     return HA_INPLACE_ADD_INDEX_NO_READ_WRITE

         |  HA_INPLACE_ADD_INDEX_NO_WRITE