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

Fix merge errors on merge 5.7 InnoDB to MariaDB 10.2

    XMLWordPrintable

    Details

    • Sprint:
      10.2.0-10, 10.2.0-11

      Description

      Merge remote-tracking branch 'merge/merge-innodb-5.7' into 10.2

      Conflicts:

      • storage/innobase/CMakeLists.txt ?
      • storage/innobase/api/api0api.cc ok
      • storage/innobase/api/api0misc.cc ok
      • storage/innobase/btr/btr0btr.cc ok
      • storage/innobase/btr/btr0cur.cc fixed
      • storage/innobase/btr/btr0sea.cc ok
      • storage/innobase/buf/buf0buf.cc ok
      • storage/innobase/buf/buf0checksum.cc ok
      • storage/innobase/buf/buf0dblwr.cc ok
      • storage/innobase/buf/buf0dump.cc ok
      • storage/innobase/buf/buf0flu.cc fixed
      • storage/innobase/buf/buf0lru.cc fixed
      • storage/innobase/buf/buf0rea.cc ok
      • storage/innobase/compile-innodb ok
      • storage/innobase/dict/dict0crea.cc ok
      • storage/innobase/dict/dict0dict.cc ok
      • storage/innobase/dict/dict0load.cc ok
      • storage/innobase/dict/dict0mem.cc ok
      • storage/innobase/dict/dict0stats.cc ok
      • storage/innobase/dict/dict0stats_bg.cc ok
      • storage/innobase/fil/fil0fil.cc ok
      • storage/innobase/fsp/fsp0fsp.cc ok
      • storage/innobase/fts/fts0fts.cc ok
      • storage/innobase/fts/fts0que.cc ok
      • storage/innobase/handler/ha_innodb.cc TODO
      • storage/innobase/handler/ha_innodb.h ok
      • storage/innobase/handler/handler0alter.cc fixed
      • storage/innobase/handler/i_s.cc ok
      • storage/innobase/handler/i_s.h ok
      • storage/innobase/ibuf/ibuf0ibuf.cc ok
      • storage/innobase/include/btr0btr.h ok
      • storage/innobase/include/btr0btr.ic ok
      • storage/innobase/include/btr0cur.h fixed
      • storage/innobase/include/btr0pcur.ic fixed
      • storage/innobase/include/buf0buf.h ok
      • storage/innobase/include/buf0buf.ic ok
      • storage/innobase/include/buf0flu.h ok
      • storage/innobase/include/buf0lru.h fixed
      • storage/innobase/include/buf0rea.h ok
      • storage/innobase/include/db0err.h ok
      • storage/innobase/include/dict0crea.h ok
      • storage/innobase/include/dict0dict.h ok
      • storage/innobase/include/dict0dict.ic TODO: Merge MDEV-9362
      • storage/innobase/include/dict0mem.h TODO: Merge MDEV-9362
      • storage/innobase/include/dict0stats.h ok
      • storage/innobase/include/dict0types.h ok
      • storage/innobase/include/fil0fil.h fixed
      • storage/innobase/include/fsp0fsp.h ok
      • storage/innobase/include/fsp0fsp.ic ok
      • storage/innobase/include/fsp0types.h TODO: Merge MDEV-9362
      • storage/innobase/include/ha0ha.h ok
      • storage/innobase/include/ha_prototypes.h ok
      • storage/innobase/include/lock0lock.h ok
      • storage/innobase/include/lock0priv.h ok
      • storage/innobase/include/log0log.h TODO: crypt_info
      • storage/innobase/include/log0recv.h ok
      • storage/innobase/include/mach0data.ic ok
      • storage/innobase/include/mtr0log.ic ok
      • storage/innobase/include/mtr0mtr.h ok
      • storage/innobase/include/mtr0mtr.ic ok
      • storage/innobase/include/os0file.h ok
      • storage/innobase/include/os0file.ic ok
      • storage/innobase/include/page0cur.ic ok
      • storage/innobase/include/page0page.h fixed
      • storage/innobase/include/page0page.ic fixed
      • storage/innobase/include/page0types.h ok
      • storage/innobase/include/page0zip.h ok
      • storage/innobase/include/rem0rec.h ok
      • storage/innobase/include/row0ftsort.h ok
      • storage/innobase/include/row0log.h ok
      • storage/innobase/include/row0merge.h ok
      • storage/innobase/include/row0mysql.h ok
      • storage/innobase/include/srv0mon.h ok
      • storage/innobase/include/srv0srv.h ok
      • storage/innobase/include/srv0start.h ok
      • storage/innobase/include/sync0rw.h ok
      • storage/innobase/include/sync0rw.ic ok
      • storage/innobase/include/sync0sync.h ok
      • storage/innobase/include/sync0sync.ic ok
      • storage/innobase/include/trx0sys.h ok
      • storage/innobase/include/trx0sys.ic ok
      • storage/innobase/include/trx0trx.h ok
      • storage/innobase/include/trx0undo.h ok
      • storage/innobase/include/univ.i ok
      • storage/innobase/include/ut0counter.h ok
      • storage/innobase/include/ut0ut.h fixed
      • storage/innobase/include/ut0wqueue.h ok
      • storage/innobase/lock/lock0lock.cc fixed
      • storage/innobase/log/log0log.cc ok
      • storage/innobase/log/log0recv.cc ok
      • storage/innobase/mtr/mtr0log.cc ok
      • storage/innobase/os/os0file.cc ok
      • storage/innobase/os/os0sync.cc ok
      • storage/innobase/os/os0thread.cc ok
      • storage/innobase/page/page0zip.cc ok
      • storage/innobase/pars/pars0pars.cc ok
      • storage/innobase/rem/rem0rec.cc ok
      • storage/innobase/row/row0ext.cc ok
      • storage/innobase/row/row0ftsort.cc ok
      • storage/innobase/row/row0import.cc ok
      • storage/innobase/row/row0ins.cc ok
      • storage/innobase/row/row0log.cc ok
      • storage/innobase/row/row0merge.cc ok
      • storage/innobase/row/row0mysql.cc ok
      • storage/innobase/row/row0sel.cc ok
      • storage/innobase/row/row0umod.cc ok
      • storage/innobase/row/row0upd.cc ok
      • storage/innobase/srv/srv0conc.cc ok
      • storage/innobase/srv/srv0mon.cc ok
      • storage/innobase/srv/srv0srv.cc ok
      • storage/innobase/srv/srv0start.cc ok
      • storage/innobase/sync/sync0arr.cc ok
      • storage/innobase/sync/sync0rw.cc ok
      • storage/innobase/sync/sync0sync.cc ok
      • storage/innobase/trx/trx0i_s.cc ok
      • storage/innobase/trx/trx0rec.cc ok
      • storage/innobase/trx/trx0sys.cc ok
      • storage/innobase/trx/trx0trx.cc ok
      • storage/innobase/trx/trx0undo.cc ok
      • storage/innobase/ut/ut0ut.cc ok

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              jplindst Jan Lindström
              Reporter:
              jplindst Jan Lindström
              Votes:
              1 Vote for this issue
              Watchers:
              2 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.