• unknown's avatar
    Merge with 4.0.13 · daac922b
    unknown authored
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/etc/logging_ok:
      auto-union
    BUILD/SETUP.sh:
      Auto merged
    BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
      Auto merged
    Makefile.am:
      Auto merged
    acinclude.m4:
      Auto merged
    BitKeeper/triggers/post-commit:
      Auto merged
    Build-tools/Do-compile:
      Auto merged
    VC++Files/libmysql/libmysql.dsp:
      Auto merged
    VC++Files/mysql.dsw:
      Auto merged
    client/mysql.cc:
      Auto merged
    client/mysqlbinlog.cc:
      Auto merged
    client/mysqldump.c:
      Auto merged
    include/config-win.h:
      Auto merged
    include/my_base.h:
      Auto merged
    include/my_global.h:
      Auto merged
    include/my_pthread.h:
      Auto merged
    include/my_sys.h:
      Auto merged
    include/violite.h:
      Auto merged
    innobase/buf/buf0flu.c:
      Auto merged
    innobase/buf/buf0lru.c:
      Auto merged
    innobase/include/buf0buf.h:
      Auto merged
    innobase/include/buf0lru.h:
      Auto merged
    innobase/include/row0mysql.h:
      Auto merged
    innobase/include/srv0srv.h:
      Auto merged
    innobase/lock/lock0lock.c:
      Auto merged
    innobase/log/l...
    daac922b
init.cc 1.8 KB