• unknown's avatar
    Merge with 4.0 · 300b778f
    unknown authored
    
    BitKeeper/etc/logging_ok:
      auto-union
    Docs/Support/texi2html:
      Auto merged
    innobase/trx/trx0rec.c:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    myisam/myisampack.c:
      Auto merged
    mysql-test/t/innodb-lock.test:
      Auto merged
    mysys/thr_lock.c:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/lock.cc:
      Auto merged
    sql/sql_acl.cc:
      Keep old code
    300b778f
sql_class.h 44.7 KB