diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 14:36:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 14:36:42 +0300 |
| commit | b857fde69ab7400181edd9d21fd943c156238ae9 (patch) | |
| tree | 81192d88dbd97c7ed7c3b54a5524e386f0f09e00 | |
| parent | 491806942ee2ba6f1e0b77eed2301d414d4446f5 (diff) | |
| parent | c35ac5489176713e3d7137789afc1c328980822b (diff) | |
| download | mariadb-git-b857fde69ab7400181edd9d21fd943c156238ae9.tar.gz | |
Merge 10.6 into 10.7
| m--------- | libmariadb | 0 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/temporary_table.test | 1 | ||||
| -rw-r--r-- | storage/innobase/row/row0ins.cc | 1 |
3 files changed, 1 insertions, 1 deletions
diff --git a/libmariadb b/libmariadb -Subproject 2adf5c6bafe206f93be711f6526916182f5d44a +Subproject c288f7d0b6fcb82cb8231293f5c03d5e5de4681 diff --git a/mysql-test/suite/innodb/t/temporary_table.test b/mysql-test/suite/innodb/t/temporary_table.test index 7d63f74c2ea..c65a6adcf0c 100644 --- a/mysql-test/suite/innodb/t/temporary_table.test +++ b/mysql-test/suite/innodb/t/temporary_table.test @@ -11,6 +11,7 @@ --disable_query_log call mtr.add_suppression("Can't create/write to file '/dev/null/nonexistent/ib"); +call mtr.add_suppression("Can't create/write to file '' \\\(Errcode: 20 \"Not a directory\"\\\)"); call mtr.add_suppression("InnoDB: Unable to create temporary file"); call mtr.add_suppression("last file in setting innodb_temp_data_file_path"); call mtr.add_suppression("The table 't1' is full"); diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 912d54bb03d..42e37ee5af6 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -3445,7 +3445,6 @@ row_ins_index_entry_set_vals( field->len = UNIV_SQL_NULL; field->type.prtype = DATA_BINARY_TYPE; } else { - ut_ad(col->len <= UNIV_PAGE_SIZE_MAX); ut_ad(ind_field->fixed_len <= col->len); dfield_set_data(field, field_ref_zero, ind_field->fixed_len); |