diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-22 18:02:40 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-22 18:02:40 +0200 |
commit | e80a842000cf42095b1bde4fb1449e709ed51b84 (patch) | |
tree | d6742633326e04a1ac7a36a1bab3693fd6e112c6 /extra/mariabackup/common.h | |
parent | 2fb31821deb98d4324b1555ff5ede21feba77f6c (diff) | |
parent | 0cba2c1ccb28bd9ef65926f3c91d5f6cc9f08cf9 (diff) | |
download | mariadb-git-e80a842000cf42095b1bde4fb1449e709ed51b84.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'extra/mariabackup/common.h')
-rw-r--r-- | extra/mariabackup/common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extra/mariabackup/common.h b/extra/mariabackup/common.h index 4d73742af49..fae466adc97 100644 --- a/extra/mariabackup/common.h +++ b/extra/mariabackup/common.h @@ -28,7 +28,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include <my_sys.h> -# define fil_is_user_tablespace_id(i) ((i) > srv_undo_tablespaces_open) +/** Determine if (i) is a user tablespace id or not. */ +# define fil_is_user_tablespace_id(i) (i != 0 \ + && !srv_is_undo_tablespace(i)) #ifdef _MSC_VER #define stat _stati64 |