Tokutek/mariadb#12 rebase to mariadb-5.5.34

storage/tokudb/hatoku_defines.h

@@ -122,6 +122,7 @@ PATENT RIGHTS GRANT:
 #if defined(TOKUDB_PATCHES) && TOKUDB_PATCHES == 0
 
 #elif 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
+// mariadb 10
 #define TOKU_USE_DB_TYPE_TOKUDB 1
 #define TOKU_INCLUDE_ALTER_56 1
 #define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0
@@ -132,11 +133,13 @@ PATENT RIGHTS GRANT:
 #endif
 
 #elif 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
+// mysql 5.7 with no patches
 #define TOKU_USE_DB_TYPE_UNKNOWN 1
 #define TOKU_INCLUDE_ALTER_56 1
 #define TOKU_PARTITION_WRITE_FRM_DATA 0
 
 #elif 50613 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
+// mysql 5.6
 #define TOKU_USE_DB_TYPE_TOKUDB 1
 #define TOKU_INCLUDE_ALTER_56 1
 #define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
@@ -148,7 +151,21 @@ PATENT RIGHTS GRANT:
 #define TOKU_INCLUDE_EXTENDED_KEYS 1
 #endif
 
+#elif defined(MARIADB_BASE_VERSION) && 50534 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
+// mariadb 5.5.X where X >= 34
+#define TOKU_USE_DB_TYPE_UNKNOWN 1
+#define TOKU_INCLUDE_ALTER_56 1
+#define TOKU_INCLUDE_ALTER_55 1
+#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
+#define TOKU_INCLUDE_XA 1
+#define TOKU_PARTITION_WRITE_FRM_DATA 1
+#define TOKU_INCLUDE_WRITE_FRM_DATA 1
+#define TOKU_INCLUDE_UPSERT 1
+#define TOKU_INCLUDE_EXTENDED_KEYS 1
+#define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 1
+
 #elif 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
+// mysql 5.5 and mariadb 5.5
 #define TOKU_USE_OTHER_DB_TYPE 1
 #define TOKU_INCLUDE_ALTER_56 1
 #define TOKU_INCLUDE_ALTER_55 1
@@ -161,8 +178,8 @@ PATENT RIGHTS GRANT:
 #define TOKU_INCLUDE_EXTENDED_KEYS 1
 #endif
 #define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 1
-#else
 
+#else
 #error
 
 #endif