diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 11:09:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 11:09:47 +0300 |
| commit | 8f643e2063c9890a353149f39ef85b2cf3151fd0 (patch) | |
| tree | c5468b905c8858dc1cc80ccb2072a923b28c8783 /storage/xtradb/trx/trx0sys.cc | |
| parent | 3aecedb2f8f99c446a5ba0b02efcf422a252c9e8 (diff) | |
| parent | b61700c22104b513caa9a85e5c6529aa5f2bf4e4 (diff) | |
| download | mariadb-git-8f643e2063c9890a353149f39ef85b2cf3151fd0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/xtradb/trx/trx0sys.cc')
| -rw-r--r-- | storage/xtradb/trx/trx0sys.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/storage/xtradb/trx/trx0sys.cc b/storage/xtradb/trx/trx0sys.cc index 558fe8a2c49..9accb4ef303 100644 --- a/storage/xtradb/trx/trx0sys.cc +++ b/storage/xtradb/trx/trx0sys.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -1064,18 +1064,12 @@ trx_sys_create_rsegs( ulint new_rsegs = n_rsegs - n_used; for (i = 0; i < new_rsegs; ++i) { - ulint space; + ulint space_id; + space_id = (n_spaces == 0) ? 0 + : (srv_undo_space_id_start + i % n_spaces); - /* Tablespace 0 is the system tablespace. All UNDO - log tablespaces start from 1. */ - - if (n_spaces > 0) { - space = (i % n_spaces) + 1; - } else { - space = 0; /* System tablespace */ - } - - if (trx_rseg_create(space) != NULL) { + /* Tablespace 0 is the system tablespace. */ + if (trx_rseg_create(space_id) != NULL) { ++n_used; } else { break; |