diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-15 14:35:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-15 14:35:51 +0300 |
| commit | 615b1f418944f2c1e3092eb89919a39dc11b365d (patch) | |
| tree | f32ce1eec037817b89ef3073663f01ff6de4d32f /storage/xtradb/dict/dict0load.cc | |
| parent | 72378a25830184f91005be7e80cfb28381c79f23 (diff) | |
| parent | 58f87a41bd8de7370cc05c41977fadc685826c9e (diff) | |
| download | mariadb-git-615b1f418944f2c1e3092eb89919a39dc11b365d.tar.gz | |
Merge 10.1 into 10.2
innodb.table_flags: Adjust the test case. Due to the MDEV-12873 fix
in 10.2, the corrupted flags for table test.td would be converted,
and a tablespace flag mismatch will occur when trying to open the file.
Diffstat (limited to 'storage/xtradb/dict/dict0load.cc')
| -rw-r--r-- | storage/xtradb/dict/dict0load.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/dict/dict0load.cc b/storage/xtradb/dict/dict0load.cc index 4991c4f3fcc..4c3dd47761f 100644 --- a/storage/xtradb/dict/dict0load.cc +++ b/storage/xtradb/dict/dict0load.cc @@ -1193,7 +1193,7 @@ loop: dberr_t err = fil_open_single_table_tablespace( read_page_0, srv_read_only_mode ? false : true, space_id, dict_tf_to_fsp_flags(flags), - name, filepath, NULL); + name, filepath); if (err != DB_SUCCESS) { ib_logf(IB_LOG_LEVEL_ERROR, @@ -2437,7 +2437,7 @@ err_exit: err = fil_open_single_table_tablespace( true, false, table->space, dict_tf_to_fsp_flags(table->flags), - name, filepath, table); + name, filepath); if (err != DB_SUCCESS) { /* We failed to find a sensible |