• unknown's avatar
    Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · 26b6dc42
    unknown authored
    into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
    
    
    client/mysqlbinlog.cc:
      Auto merged
    client/mysqldump.c:
      Auto merged
    config/ac-macros/ha_ndbcluster.m4:
      Auto merged
    configure.in:
      Auto merged
    include/my_global.h:
      Auto merged
    mysql-test/r/mysqldump.result:
      Auto merged
    mysql-test/r/rpl_timezone.result:
      Auto merged
    mysql-test/t/disabled.def:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/item_create.cc:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log.h:
      Auto merged
    sql/log_event.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/rpl_injector.h:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    sql/table.cc:
      Auto merged
    mysql-test/t/mysqldump.test:
      Manual merge
    sql/log_event.cc:
      manual merge
    26b6dc42
ha_ndbcluster.m4 11.1 KB