refs #5524 turn on hot alter table in mariadb 10

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

refs #5524 turn on hot alter table in mariadb 10
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@48341 c7de825b-a66e-492c-adef-691d508d4ae1
fa0262d3 · Rich Prohaska · Yoni Fogel · 2ccde85f · fa0262d3 · fa0262d3
Commit fa0262d3 authored Apr 17, 2013 by Rich Prohaska Committed by Yoni Fogel Apr 17, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

storage/tokudb/ha_tokudb_alter_56.cc storage/tokudb/ha_tokudb_alter_56.cc +4 -3

storage/tokudb/hatoku_defines.h storage/tokudb/hatoku_defines.h +1 -1

No files found.
--- a/storage/tokudb/ha_tokudb_alter_56.cc
+++ b/storage/tokudb/ha_tokudb_alter_56.cc
 #if TOKU_INCLUDE_ALTER_56

-// get the 5.6 code to compile on 5.5
-#if 50600 < MYSQL_VERSION_ID
+#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+#define TOKU_ALTER_RENAME ALTER_RENAME_56
+#elif 50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
 #define TOKU_ALTER_RENAME ALTER_RENAME
-#elif 50500 < MYSQL_VERSION_ID
+#elif 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
 #define TOKU_ALTER_RENAME ALTER_RENAME_56
 #else
 #error

--- a/storage/tokudb/hatoku_defines.h
+++ b/storage/tokudb/hatoku_defines.h
@@ -30,7 +30,7 @@
 #endif

 #if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
-#define TOKU_INCLUDE_ALTER_56 0
+#define TOKU_INCLUDE_ALTER_56 1
 #define TOKU_INCLUDE_ALTER_55 1
 #define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
 #define TOKU_INCLUDE_XA 0