• unknown's avatar
    Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl · 2b0abf76
    unknown authored
    into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
    
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/deleted/.del-rpl_row_charset.test:
      Auto merged
    CMakeLists.txt:
      Auto merged
    configure.in:
      Auto merged
    client/mysqltest.c:
      Auto merged
    mysql-test/extra/binlog_tests/blackhole.test:
      Auto merged
    mysql-test/include/commit.inc:
      Auto merged
    mysql-test/include/mix1.inc:
      Auto merged
    mysql-test/lib/mtr_report.pm:
      Auto merged
    mysql-test/r/commit_1innodb.result:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/ctype_big5.result:
      Auto merged
    mysql-test/r/drop.result:
      Auto merged
    mysql-test/r/group_by.result:
      Auto merged
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/r/loaddata.result:
      Auto merged
    mysql-test/r/mysqlbinlog.result:
      Auto merged
    mysql-test/r/partition_error.result:
      Auto merged
    mysql-test/r/query_cache.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/r/warnings.result:
      Auto merged
    mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
      Auto merged
    mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
      Auto merged
    mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
      Auto merged
    mysql-test/suite/binlog/r/binlog_unsafe.result:
      Auto merged
    mysql-test/suite/binlog/t/binlog_unsafe.test:
      Auto merged
    mysql-test/suite/federated/federated.result:
      Auto merged
    mysql-test/suite/federated/federated.test:
      Auto merged
    mysql-test/suite/parts/r/partition_alter1_myisam.result:
      Auto merged
    mysql-test/suite/parts/r/partition_alter2_myisam.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_log.result:
      Auto merged
    mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
      Auto merged
    mysql-test/suite/rpl/t/disabled.def:
      Auto merged
    mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
      Auto merged
    mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/csv.test:
      Auto merged
    mysql-test/t/disabled.def:
      Auto merged
    mysql-test/t/distinct.test:
      Auto merged
    mysql-test/t/drop.test:
      Auto merged
    mysql-test/t/group_by.test:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    mysql-test/t/loaddata.test:
      Auto merged
    mysql-test/t/partition_error.test:
      Auto merged
    mysql-test/t/query_cache.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    mysql-test/t/warnings.test:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    BitKeeper/deleted/.del-combinations:
      Delete: mysql-test/suite/binlog/combinations
    mysql-test/r/partition_not_windows.result:
      Use remote
    mysql-test/r/partition_symlink.result:
      Use remote
    mysql-test/r/symlink.result:
      SCCS merged
    mysql-test/suite/parts/inc/partition_basic.inc:
      SCCS merged
    mysql-test/suite/parts/inc/partition_check_drop.inc:
      Use remote
    mysql-test/suite/parts/inc/partition_layout_check1.inc:
      Use remote
    mysql-test/suite/parts/inc/partition_layout_check2.inc:
      Use remote
    mysql-test/suite/parts/r/partition_basic_innodb.result:
      Use remote
    mysql-test/suite/parts/r/partition_basic_myisam.result:
      Use remote
    mysql-test/suite/parts/r/partition_engine_myisam.result:
      Use remote
    mysql-test/suite/parts/t/partition_sessions.test:
      SCCS merged
    mysql-test/t/partition.test:
      SCCS merged
    mysql-test/t/partition_not_windows.test:
      Use remote
    mysql-test/t/partition_symlink.test:
      Use remote
    mysql-test/t/symlink.test:
      Use remote
    mysql-test/suite/binlog/r/binlog_multi_engine.result:
      Manual merge, name of binlog file changed
    mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
      Manual merge
    mysys/my_init.c:
      Manual merge
    2b0abf76
partition_error.result 19.3 KB