database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch 'bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2018-02-23 08:43:34 +01:00
parent 131d9a5d0c b8af22af15
commit 2732fcc608
63 changed files with 1137 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/rocksdb/rdb_datadic.cc
View File

@@ -538,7 +538,7 @@ const std::string Rdb_key_def::parse_comment_for_qualifier(
// NOTE: this means if you specify a qualifier for a specific partition it
// will take precedence the 'table level' qualifier if one exists.
std::string search_str_part;
if (table_arg->part_info != nullptr) {
if (IF_PARTITIONING(table_arg->part_info,nullptr) != nullptr) {
std::string partition_name = tbl_def_arg->base_partition();
DBUG_ASSERT(!partition_name.empty());
search_str_part = gen_qualifier_for_table(qualifier, partition_name);