diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-15 12:41:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-15 12:41:02 +0300 |
| commit | 58f87a41bd8de7370cc05c41977fadc685826c9e (patch) | |
| tree | 05efedf2233c3f0a14d126ef9ffcaeb24f375712 /storage/xtradb/dict/dict0load.cc | |
| parent | 88b961816e90c57b0f6f166e6c7650a1ae540751 (diff) | |
| download | mariadb-git-58f87a41bd8de7370cc05c41977fadc685826c9e.tar.gz | |
Remove some fields from dict_table_t
dict_table_t::thd: Remove. This was only used by btr_root_block_get()
for reporting decryption failures, and it was only assigned by
ha_innobase::open(), and never cleared. This could mean that if a
connection is closed, the pointer would become stale, and the server
could crash while trying to report the error. It could also mean
that an error is being reported to the wrong client. It is better
to use current_thd in this case, even though it could mean that if
the code is invoked from an InnoDB background operation, there would
be no connection to which to send the error message.
Remove dict_table_t::crypt_data and dict_table_t::page_0_read.
These fields were never read.
fil_open_single_table_tablespace(): Remove the parameter "table".
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 dc3f9c85bba..6171bbd80d0 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 |