summaryrefslogtreecommitdiff
path: root/sql/partition_info.h
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2018-01-08 13:32:02 +0300
committerGitHub <noreply@github.com>2018-01-08 13:32:02 +0300
commit5dddbafa4eea04cbec1c07c397403900ea12341e (patch)
tree5757e5b2ee69cbfe5bb64ee71bd12c6d770bb0ec /sql/partition_info.h
parent912769b7dc2022b2dea151a821bff0040a31cf69 (diff)
downloadmariadb-git-5dddbafa4eea04cbec1c07c397403900ea12341e.tar.gz
MDEV-14821 Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())` failed in Diagnostics_area::set_ok_status
Diffstat (limited to 'sql/partition_info.h')
-rw-r--r--sql/partition_info.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/partition_info.h b/sql/partition_info.h
index b167284d3fd..3883fac5181 100644
--- a/sql/partition_info.h
+++ b/sql/partition_info.h
@@ -562,7 +562,10 @@ public:
Field *f= part_field_array[i];
bitmap_set_bit(f->table->write_set, f->field_index);
}
+ MEM_ROOT *old_root= thd->mem_root;
+ thd->mem_root= &table->mem_root;
result= check_range_constants(thd, false);
+ thd->mem_root= old_root;
vers_info->stat_serial= table->s->stat_serial;
mysql_rwlock_unlock(&table->s->LOCK_stat_serial);
return result;