rebase to mysql 5.6.13

e3ab3d17 · Rich Prohaska · b2b90975 · e3ab3d17
Commit e3ab3d17 authored Aug 27, 2013 by Rich Prohaska
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

No files found.
--- a/storage/tokudb/hatoku_defines.h
+++ b/storage/tokudb/hatoku_defines.h
@@ -130,11 +130,11 @@ PATENT RIGHTS GRANT:

 #elif 50613 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
 #define TOKU_INCLUDE_ALTER_56 1
-#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0
-#define TOKU_INCLUDE_XA 0
+#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
-#define TOKU_INCLUDE_UPSERT 0
+#define TOKU_INCLUDE_UPSERT 1
 #define TOKU_INCLUDE_EXTENDED_KEYS 0

 #elif 50610 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50610