• unknown's avatar
    Ugly merge! But I am not done yet - there are a number of things I need to fix · 78fc1ed4
    unknown authored
    before I can push
    
    
    BitKeeper/etc/ignore:
      auto-union
    Makefile.am:
      Auto merged
    include/my_sys.h:
      Auto merged
    libmysqld/lib_sql.cc:
      Auto merged
    mysql-test/t/rpl_log.test:
      Auto merged
    mysys/mf_iocache.c:
      Auto merged
    mysys/mf_iocache2.c:
      Auto merged
    mysys/thr_mutex.c:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/lex.h:
      Auto merged
    sql/mini_client.cc:
      Auto merged
    sql/mini_client.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/repl_failsafe.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/stacktrace.c:
      Auto merged
    sql/structs.h:
      Auto merged
    mysql-test/r/rpl000014.result:
      merge
    mysql-test/r/rpl000015.result:
      merge
    mysql-test/r/rpl000016.result:
      merge
    mysql-test/r/rpl_log.result:
      merge
    sql/log.cc:
      merge
    sql/log_event.cc:
      merge
    sql/log_event.h:
      merge
    sql/mysqld.cc:
      merge
    sql/slave.cc:
      merge
    sql/slave.h:
      merge
    sql/sql_class.h:
      merge
    sql/sql_parse.cc:
      merge
    sql/sql_repl.cc:
      merge
    sql/sql_yacc.yy:
      merge
    78fc1ed4
thr_mutex.c 6.63 KB