Commit d6bbcd61 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

#4729 get the compilation of the compression patch correct refs[t:4729]

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@42862 c7de825b-a66e-492c-adef-691d508d4ae1
parent 8630ee8f
...@@ -6151,7 +6151,7 @@ static inline enum row_type ...@@ -6151,7 +6151,7 @@ static inline enum row_type
compression_method_to_row_type(enum toku_compression_method method) compression_method_to_row_type(enum toku_compression_method method)
{ {
switch (method) { switch (method) {
#if defined(ROW_TYPE_TOKU_UNCOMPRESSED) #if TOKU_INCLUDE_ROW_TYPE_COMPRESSION
case TOKU_NO_COMPRESSION: case TOKU_NO_COMPRESSION:
return ROW_TYPE_TOKU_UNCOMPRESSED; return ROW_TYPE_TOKU_UNCOMPRESSED;
case TOKU_ZLIB_METHOD: case TOKU_ZLIB_METHOD:
...@@ -6195,7 +6195,7 @@ static inline enum toku_compression_method ...@@ -6195,7 +6195,7 @@ static inline enum toku_compression_method
row_type_to_compression_method(enum row_type type) row_type_to_compression_method(enum row_type type)
{ {
switch (type) { switch (type) {
#if defined(ROW_TYPE_TOKU_UNCOMPRESSED) #if TOKU_INCLUDE_ROW_TYPE_COMPRESSION
case ROW_TYPE_TOKU_UNCOMPRESSED: case ROW_TYPE_TOKU_UNCOMPRESSED:
return TOKU_NO_COMPRESSION; return TOKU_NO_COMPRESSION;
case ROW_TYPE_TOKU_ZLIB: case ROW_TYPE_TOKU_ZLIB:
...@@ -6601,7 +6601,7 @@ static inline enum row_type ...@@ -6601,7 +6601,7 @@ static inline enum row_type
row_format_to_row_type(srv_row_format_t row_format) row_format_to_row_type(srv_row_format_t row_format)
{ {
switch (row_format) { switch (row_format) {
#if defined(ROW_TYPE_TOKU_UNCOMPRESSED) #if TOKU_INCLUDE_ROW_TYPE_COMPRESSION
case SRV_ROW_FORMAT_UNCOMPRESSED: case SRV_ROW_FORMAT_UNCOMPRESSED:
return ROW_TYPE_TOKU_UNCOMPRESSED; return ROW_TYPE_TOKU_UNCOMPRESSED;
case SRV_ROW_FORMAT_ZLIB: case SRV_ROW_FORMAT_ZLIB:
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#endif #endif
#define TOKU_INCLUDE_CHECKPOINT_LOCK 1 #define TOKU_INCLUDE_CHECKPOINT_LOCK 1
#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
#if !defined(HA_CLUSTERING) #if !defined(HA_CLUSTERING)
#define HA_CLUSTERING 0 #define HA_CLUSTERING 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment