1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä 2017-11-10 16:07:01 +02:00
commit 386e5d476e
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/innodb/r/table_definition_cache_debug.result
View File

@ -1,3 +1,4 @@
call mtr.add_suppression("InnoDB: innodb_open_files=13 is exceeded");
SET @save_tdc= @@GLOBAL.table_definition_cache;
SET @save_toc= @@GLOBAL.table_open_cache;
SET GLOBAL table_definition_cache= 400;

2
mysql-test/suite/innodb/t/table_definition_cache_debug.test
View File

@ -2,6 +2,8 @@
--source include/have_debug.inc
--source include/have_debug_sync.inc
call mtr.add_suppression("InnoDB: innodb_open_files=13 is exceeded");
SET @save_tdc= @@GLOBAL.table_definition_cache;
SET @save_toc= @@GLOBAL.table_open_cache;

1
storage/innobase/rem/rem0rec.cc
View File

@ -594,6 +594,7 @@ rec_get_offsets_func(
ut_ad(is_user_rec || n == 1);
ut_ad(!is_user_rec || leaf || index->is_dummy
|| dict_index_is_ibuf(index)
|| n == n_fields /* dict_stats_analyze_index_level() */
|| n
== dict_index_get_n_unique_in_tree_nonleaf(index) + 1);
ut_ad(!is_user_rec || !leaf || index->is_dummy

21
storage/innobase/row/row0log.cc
View File

@ -203,11 +203,6 @@ struct row_log_t {
byte* crypt_head; /*!< reader context;
temporary buffer used in encryption,
decryption or NULL */
ulint n_old_col;
/*!< number of non-virtual column in
old table */
ulint n_old_vcol;
/*!< number of virtual column in old table */
const char* path; /*!< where to create temporary file during
log operation */
};
@ -2334,13 +2329,6 @@ row_log_table_apply_op(
next_mrec = mrec + rec_offs_data_size(offsets);
if (log->table->n_v_cols) {
if (next_mrec + 2 > mrec_end) {
return(NULL);
}
next_mrec += mach_read_from_2(next_mrec);
}
if (next_mrec > mrec_end) {
return(NULL);
} else {
@ -2375,13 +2363,6 @@ row_log_table_apply_op(
rec_offs_set_n_fields(offsets, new_index->n_uniq + 2);
rec_init_offsets_temp(mrec, new_index, offsets);
next_mrec = mrec + rec_offs_data_size(offsets) + ext_size;
if (log->table->n_v_cols) {
if (next_mrec + 2 > mrec_end) {
return(NULL);
}
next_mrec += mach_read_from_2(next_mrec);
}
if (next_mrec > mrec_end) {
return(NULL);
@ -3092,8 +3073,6 @@ row_log_allocate(
log->head.blocks = log->head.bytes = 0;
log->head.total = 0;
log->path = path;
log->n_old_col = index->table->n_cols;
log->n_old_vcol = index->table->n_v_cols;
dict_index_set_online_status(index, ONLINE_INDEX_CREATION);
index->online_log = log;