summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-24 20:01:55 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-24 20:01:55 +0100
commitc11c64e97208af18bbf2a1d684af19efbbed495e (patch)
treec03b65945c2167b42ee2ae2caea8bdba1dc021c0 /storage
parentc18fb72e71588e6f33fcdaee23093d1f07fb4c78 (diff)
downloadmariadb-git-c11c64e97208af18bbf2a1d684af19efbbed495e.tar.gz
MDEV-5822 TokuDB fails to compile without partition storage engine
Diffstat (limited to 'storage')
-rw-r--r--storage/tokudb/ha_tokudb.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc
index de34e18bd1a..d12cd5fb7a6 100644
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@@ -1650,7 +1650,7 @@ int ha_tokudb::initialize_share(
goto exit;
#else
// 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);
if (error)
goto exit;
@@ -6934,7 +6934,7 @@ int ha_tokudb::create(const char *name, TABLE * form, HA_CREATE_INFO * create_in
if (error) { goto cleanup; }
#else
// 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);
if (error) { goto cleanup; }
}