diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
| commit | 29acdcd5427e13bc3aefbbeee17b42bfe23dea84 (patch) | |
| tree | f8f5365594c3b43e01891b7017f47fa6b934c646 /storage/mroonga/mrn_table.cpp | |
| parent | e33bda183e80ff63a984ed2a938467950b23a3fd (diff) | |
| parent | daec0004502a1f8c2ff7d46de92a61b5c4da1d6c (diff) | |
| download | mariadb-git-MDEV-9804.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804
Conflicts:
VERSION
debian/mariadb-backup-10.2.files
debian/mariadb-backup-10.2.install
debian/mariadb-backup-10.3.files
mysql-test/unstable-tests
Diffstat (limited to 'storage/mroonga/mrn_table.cpp')
| -rw-r--r-- | storage/mroonga/mrn_table.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/storage/mroonga/mrn_table.cpp b/storage/mroonga/mrn_table.cpp index 629c96d3e1a..8984db3bfbf 100644 --- a/storage/mroonga/mrn_table.cpp +++ b/storage/mroonga/mrn_table.cpp @@ -202,7 +202,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length, const TABLE *table, partition_element **part_elem, partition_element **sub_elem) { - char tmp_name[FN_LEN]; + char tmp_name[FN_REFLEN + 1]; partition_info *part_info = table->part_info; partition_element *tmp_part_elem = NULL, *tmp_sub_elem = NULL; bool tmp_flg = FALSE, tmp_find_flg = FALSE; @@ -224,9 +224,10 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length, List_iterator<partition_element> sub_it((*part_elem)->subpartitions); while ((*sub_elem = sub_it++)) { - create_subpartition_name(tmp_name, table->s->path.str, - (*part_elem)->partition_name, (*sub_elem)->partition_name, - NORMAL_PART_NAME); + if (create_subpartition_name(tmp_name, sizeof(tmp_name), table->s->path.str, + (*part_elem)->partition_name, (*sub_elem)->partition_name, + NORMAL_PART_NAME)) + DBUG_VOID_RETURN; DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name)); if (table_name && !memcmp(table_name, tmp_name, table_name_length + 1)) DBUG_VOID_RETURN; @@ -243,8 +244,9 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length, } } } else { - create_partition_name(tmp_name, table->s->path.str, - (*part_elem)->partition_name, NORMAL_PART_NAME, TRUE); + if (create_partition_name(tmp_name, sizeof(tmp_name), table->s->path.str, + (*part_elem)->partition_name, NORMAL_PART_NAME, TRUE)) + DBUG_VOID_RETURN; DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name)); if (table_name && !memcmp(table_name, tmp_name, table_name_length + 1)) DBUG_VOID_RETURN; |