Commit c11c64e9 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-5822 TokuDB fails to compile without partition storage engine

parent c18fb72e
...@@ -89,6 +89,12 @@ ...@@ -89,6 +89,12 @@
#define IF_WIN(A,B) B #define IF_WIN(A,B) B
#endif #endif
#ifdef WITH_PARTITION_STORAGE_ENGINE
#define IF_PARTITIONING(A,B) A
#else
#define IF_PARTITIONING(A,B) B
#endif
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
#ifdef WITH_NDB_BINLOG #ifdef WITH_NDB_BINLOG
#define HAVE_NDB_BINLOG 1 #define HAVE_NDB_BINLOG 1
......
...@@ -1650,7 +1650,7 @@ int ha_tokudb::initialize_share( ...@@ -1650,7 +1650,7 @@ int ha_tokudb::initialize_share(
goto exit; goto exit;
#else #else
// verify frm data for non-partitioned tables // verify frm data for non-partitioned tables
if (table->part_info == NULL) { if (IF_PARTITIONING(table->part_info, NULL) == NULL) {
error = verify_frm_data(table->s->path.str, txn); error = verify_frm_data(table->s->path.str, txn);
if (error) if (error)
goto exit; goto exit;
...@@ -6934,7 +6934,7 @@ int ha_tokudb::create(const char *name, TABLE * form, HA_CREATE_INFO * create_in ...@@ -6934,7 +6934,7 @@ int ha_tokudb::create(const char *name, TABLE * form, HA_CREATE_INFO * create_in
if (error) { goto cleanup; } if (error) { goto cleanup; }
#else #else
// only for tables that are not partitioned // only for tables that are not partitioned
if (form->part_info == NULL) { if (IF_PARTITIONING(form->part_info, NULL) == NULL) {
error = write_frm_data(status_block, txn, form->s->path.str); error = write_frm_data(status_block, txn, form->s->path.str);
if (error) { goto cleanup; } if (error) { goto cleanup; }
} }
......
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