• unknown's avatar
    Merge · 7b24c57c
    unknown authored
    
    include/my_base.h:
      Try again merge InnoDB-3.23.44
    include/mysqld_error.h:
      Try again merge InnoDB-3.23.44
    sql/handler.cc:
      Try again merge InnoDB-3.23.44
    sql/mysqld.cc:
      Try again merge InnoDB-3.23.44
    sql/ha_innobase.cc:
      Try again merge InnoDB-3.23.44
    sql/ha_innobase.h:
      Try again merge InnoDB-3.23.44
    sql/share/czech/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/danish/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/dutch/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/english/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/estonian/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/french/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/german/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/greek/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/hungarian/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/italian/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/japanese/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/korean/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/norwegian-ny/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/norwegian/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/polish/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/portuguese/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/romanian/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/russian/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/slovak/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/spanish/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/swedish/errmsg.txt:
      Try again merge InnoDB-3.23.44
    sql/share/ukrainian/errmsg.txt:
      Try again merge InnoDB-3.23.44
    innobase/btr/btr0btr.c:
      Try again merge InnoDB-3.23.44
    innobase/buf/buf0flu.c:
      Try again merge InnoDB-3.23.44
    innobase/buf/buf0lru.c:
      Try again merge InnoDB-3.23.44
    innobase/dict/dict0boot.c:
      Try again merge InnoDB-3.23.44
    innobase/dict/dict0crea.c:
      Try again merge InnoDB-3.23.44
    innobase/dict/dict0dict.c:
      Try again merge InnoDB-3.23.44
    innobase/ibuf/ibuf0ibuf.c:
      Try again merge InnoDB-3.23.44
    innobase/include/dict0boot.h:
      Try again merge InnoDB-3.23.44
    innobase/include/dict0boot.ic:
      Try again merge InnoDB-3.23.44
    innobase/include/dict0dict.h:
      Try again merge InnoDB-3.23.44
    innobase/include/os0file.h:
      Try again merge InnoDB-3.23.44
    innobase/include/os0sync.h:
      Try again merge InnoDB-3.23.44
    innobase/include/page0page.ic:
      Try again merge InnoDB-3.23.44
    innobase/include/read0read.h:
      Try again merge InnoDB-3.23.44
    innobase/include/row0mysql.h:
      Try again merge InnoDB-3.23.44
    innobase/include/srv0srv.h:
      Try again merge InnoDB-3.23.44
    innobase/include/srv0start.h:
      Try again merge InnoDB-3.23.44
    innobase/include/trx0purge.h:
      Try again merge InnoDB-3.23.44
    innobase/include/trx0rec.h:
      Try again merge InnoDB-3.23.44
    innobase/include/trx0trx.h:
      Try again merge InnoDB-3.23.44
    innobase/lock/lock0lock.c:
      Try again merge InnoDB-3.23.44
    innobase/log/log0log.c:
      Try again merge InnoDB-3.23.44
    innobase/log/log0recv.c:
      Try again merge InnoDB-3.23.44
    innobase/os/os0file.c:
      Try again merge InnoDB-3.23.44
    innobase/page/page0page.c:
      Try again merge InnoDB-3.23.44
    innobase/read/read0read.c:
      Try again merge InnoDB-3.23.44
    innobase/rem/rem0cmp.c:
      Try again merge InnoDB-3.23.44
    innobase/rem/rem0rec.c:
      Try again merge InnoDB-3.23.44
    innobase/row/row0ins.c:
      Try again merge InnoDB-3.23.44
    innobase/row/row0mysql.c:
      Try again merge InnoDB-3.23.44
    innobase/row/row0purge.c:
      Try again merge InnoDB-3.23.44
    innobase/row/row0row.c:
      Try again merge InnoDB-3.23.44
    innobase/row/row0sel.c:
      Try again merge InnoDB-3.23.44
    innobase/row/row0umod.c:
      Try again merge InnoDB-3.23.44
    innobase/row/row0upd.c:
      Try again merge InnoDB-3.23.44
    innobase/row/row0vers.c:
      Try again merge InnoDB-3.23.44
    innobase/srv/srv0start.c:
      Try again merge InnoDB-3.23.44
    innobase/sync/sync0arr.c:
      Try again merge InnoDB-3.23.44
    innobase/trx/trx0purge.c:
      Try again merge InnoDB-3.23.44
    innobase/trx/trx0rec.c:
      Try again merge InnoDB-3.23.44
    innobase/trx/trx0roll.c:
      Try again merge InnoDB-3.23.44
    innobase/trx/trx0sys.c:
      Try again merge InnoDB-3.23.44
    innobase/trx/trx0trx.c:
      Try again merge InnoDB-3.23.44
    innobase/trx/trx0undo.c:
      Try again merge InnoDB-3.23.44
    innobase/srv/srv0srv.c:
      Commit change made by heikki
    BitKeeper/etc/logging_ok:
      Logging to logging@openlogging.org accepted
    7b24c57c
errmsg.txt 13.9 KB