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

Use the 10.2 libmariadb in 10.3

    XMLWordPrintable

Details

    Description

      MDEV-11371 introduced a change to libmariadb:

      commit e069fb8e76eeab096b8255805244f73048e3575a (HEAD, origin/svoj-MDEV-11371)
      Author: Sergey Vojtovich <svoj@mariadb.org>
      Date:   Thu Aug 31 15:09:10 2017 +0400
       
          MDEV-11371 - column compression
       
      diff --git a/include/mariadb_com.h b/include/mariadb_com.h
      index 727c66b..8ccc171 100644
      --- a/include/mariadb_com.h
      +++ b/include/mariadb_com.h
      @@ -330,6 +330,8 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
                               MYSQL_TYPE_TIMESTAMP2,
                               MYSQL_TYPE_DATETIME2,
                               MYSQL_TYPE_TIME2,
      +                        MYSQL_TYPE_BLOB_COMPRESSED= 140,
      +                        MYSQL_TYPE_VARCHAR_COMPRESSED= 141,
                               /* --------------------------------------------- */
                               MYSQL_TYPE_JSON=245,
                               MYSQL_TYPE_NEWDECIMAL=246,
      

      According to serg this should not have been added; the parameters should be private to the server, not exposed to the client.

      Now, a merge from 10.2 is causing a conflict for libmariadb, because there have been changes in the libmariadb that is used in 10.2. This conflict needs to be resolved in some way.

      It appears that some client code is depending on the definitions. And those files should probably not include mysql_com.h to get the server-side definition.

      Attachments

        Issue Links

          Activity

            People

              svoj Sergey Vojtovich
              marko Marko Mäkelä
              Votes:
              0 Vote for this issue
              Watchers:
              5 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.