• unknown's avatar
    Merge with 4.0 · 1065f2bb
    unknown authored
    
    innobase/dict/dict0boot.c:
      Auto merged
    innobase/dict/dict0load.c:
      Auto merged
    innobase/dict/dict0mem.c:
      Auto merged
    innobase/fut/fut0lst.c:
      Auto merged
    innobase/include/buf0lru.h:
      Auto merged
    innobase/include/dict0mem.h:
      Auto merged
    innobase/include/fsp0fsp.h:
      Auto merged
    innobase/include/ha0ha.h:
      Auto merged
    innobase/include/ibuf0ibuf.h:
      Auto merged
    innobase/include/lock0lock.h:
      Auto merged
    innobase/include/log0log.h:
      Auto merged
    innobase/include/mem0pool.h:
      Auto merged
    innobase/include/mtr0mtr.h:
      Auto merged
    innobase/include/os0file.h:
      Auto merged
    innobase/include/rem0rec.h:
      Auto merged
    innobase/include/rem0rec.ic:
      Auto merged
    innobase/include/srv0srv.h:
      Auto merged
    innobase/include/sync0sync.h:
      Auto merged
    innobase/include/trx0sys.h:
      Auto merged
    innobase/include/ut0byte.h:
      Auto merged
    innobase/include/ut0ut.h:
      Auto merged
    innobase/mem/mem0pool.c:
      Auto merged
    innobase/mtr/mtr0mtr.c:
      Auto merged
    innobase/os/os0proc.c:
      Auto merged
    innobase/pars/lexyy.c:
      Auto merged
    innobase/pars/pars0opt.c:
      Auto merged
    innobase/row/row0ins.c:
      Auto merged
    innobase/row/row0purge.c:
      Auto merged
    innobase/row/row0uins.c:
      Auto merged
    innobase/row/row0umod.c:
      Auto merged
    innobase/row/row0undo.c:
      Auto merged
    innobase/row/row0upd.c:
      Auto merged
    innobase/trx/trx0purge.c:
      Auto merged
    innobase/trx/trx0roll.c:
      Auto merged
    innobase/trx/trx0sys.c:
      Auto merged
    innobase/trx/trx0undo.c:
      Auto merged
    innobase/ut/ut0byte.c:
      Auto merged
    pstack/bucomm.h:
      Auto merged
    pstack/budbg.h:
      Auto merged
    sql/item_sum.h:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_db.cc:
      Auto merged
    support-files/mysql.spec.sh:
      Auto merged
    tests/insert_test.c:
      Auto merged
    mysql-test/t/func_group.test:
      Merge with 4.0
      Put 4.1 tests lasts
    sql/ha_innodb.cc:
      Merge with 4.0
      Added checking of results from my_malloc()
    BitKeeper/etc/logging_ok:
      Logging to logging@openlogging.org accepted
    1065f2bb
ha0ha.h 4.64 KB