diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 13:02:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 13:02:26 +0300 |
| commit | 7783161f30303a74fd7489edff5ef6bc60888a0b (patch) | |
| tree | 5cceafaca59b901a9f1284692503e83eb592a3f7 | |
| parent | 5f4314f0e6033e81361641a6731c0ef1656cc35c (diff) | |
| parent | 8cb2027bd609be465090a1d957fb60643f9a0bdb (diff) | |
| download | mariadb-git-7783161f30303a74fd7489edff5ef6bc60888a0b.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | mysql-test/suite/innodb/t/temporary_table.test | 1 | ||||
| -rw-r--r-- | storage/innobase/row/row0ins.cc | 1 |
2 files changed, 1 insertions, 1 deletions
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); |