Uploaded image for project: 'MariaDB Server'
  1. MariaDB Server
  2. MDEV-21595

typedef offset_t conflicts on AIX

Details

    Description

      Hi,
      On 10.4.12, a new typedef has been introduced on InnoDB:

      storage/innobase/include/rem0types.h:34: typedef short unsigned int offset_t

      This typedef conflicts with an AIX typdef

      /usr/include/sys/types.h:716: typedef long long int offset_t

      It seems a mass substitution of ulint type to offset_t was made between mariadb10.4.11 and 10.4.12.

      Thanks,
      Etienne.

      Attachments

        Issue Links

          is caused by

          Task - A task that needs to be done. MDEV-20950 Reduce size of record offsets

          • Major - Major loss of function.
          • Closed
          links to

          Web Link pr 1491

          Activity

            Ascending order - Click to sort in descending order
            EGuesnet Etienne Guesnet added a comment -

            Related to MDEV-20950 and this commit.

            EGuesnet Etienne Guesnet added a comment - Related to MDEV-20950 and this commit .
            fiddaman Andy added a comment -

            Same problem on illumos platforms:

            storage/innobase/include/rem0types.h:34:28: error: conflicting declaration 'typedef short unsigned int offset_t'
            		 
             typedef unsigned short int offset_t;
            		 
                                        ^~~~~~~~
            		 
            /usr/include/sys/types.h:242:20: note: previous declaration as 'typedef longlong_t offset_t'
            		 
             typedef longlong_t offset_t;
            		 
                                ^~~~~~~~

            fiddaman Andy added a comment - Same problem on illumos platforms: storage/innobase/include/rem0types.h:34:28: error: conflicting declaration 'typedef short unsigned int offset_t' typedef unsigned short int offset_t; ^~~~~~~~ /usr/include/sys/types.h:242:20: note: previous declaration as 'typedef longlong_t offset_t' typedef longlong_t offset_t; ^~~~~~~~
            elenst Elena Stepanova added a comment -

            The change was apparently performed in the scope of MDEV-20950

            commit f0aa073f2bf3d8d85b3d028df89cdb4cdfc4002d
            		 
            Author: Eugene Kosov <claprix@yandex.ru>
            		 
            Date:   Mon Nov 4 22:30:12 2019 +0300
            		 
             
            		 
                MDEV-20950 Reduce size of record offsets
            		 
             
            		 
            ...

            elenst Elena Stepanova added a comment - The change was apparently performed in the scope of MDEV-20950 commit f0aa073f2bf3d8d85b3d028df89cdb4cdfc4002d Author: Eugene Kosov <claprix@yandex.ru> Date: Mon Nov 4 22:30:12 2019 +0300   MDEV-20950 Reduce size of record offsets   ...
            EGuesnet Etienne Guesnet added a comment -

            I agree (cf first comment).
            Replacing offset_t by a more specific name, e.g. innodb_offset_t, would be enough.

            EGuesnet Etienne Guesnet added a comment - I agree (cf first comment). Replacing offset_t by a more specific name, e.g. innodb_offset_t , would be enough.
            marko Marko Mäkelä added a comment -

            kevg, could you please perform the following:

            perl -i -pe 's/\<offset_t\>/rec_offs/g' $(git grep -w offset_t storage/innobase)

            I think that the new type name should be of the same length as the old one, so that we can avoid reformatting any code.

            marko Marko Mäkelä added a comment - kevg , could you please perform the following: perl -i -pe 's/\<offset_t\>/rec_offs/g' $(git grep -w offset_t storage/innobase) I think that the new type name should be of the same length as the old one, so that we can avoid reformatting any code.
            robertbindar Robert Bindar added a comment -

            Solved in PR-1491

            robertbindar Robert Bindar added a comment - Solved in PR-1491

            People

              kevg Eugene Kosov (Inactive)
              EGuesnet Etienne Guesnet
              Votes:
              0 Vote for this issue
              Watchers:
              6 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Git Integration

                  Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.