• unknown's avatar
    Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl · 9cf83298
    unknown authored
    into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
    
    
    client/mysqltest.c:
      Auto merged
    configure.in:
      Auto merged
    mysql-test/extra/rpl_tests/rpl_loaddata.test:
      Auto merged
    mysql-test/extra/rpl_tests/rpl_log.test:
      Auto merged
    mysql-test/include/mix1.inc:
      Auto merged
    mysql-test/lib/mtr_report.pm:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/gis.result:
      Auto merged
    mysql-test/r/mysqlbinlog.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/r/view.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/rpl/r/rpl_flushlog_loop.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/t/create.test:
      Auto merged
    mysql-test/t/disabled.def:
      Auto merged
    mysql-test/t/mysqldump.test:
      Auto merged
    mysql-test/t/show_check.test:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/ha_ndbcluster_binlog.cc:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Use local
    mysql-test/r/type_blob.result:
      Manual merge
    mysql-test/suite/binlog/r/binlog_multi_engine.result:
      Manual merge
    mysql-test/suite/binlog/r/binlog_unsafe.result:
      Manual merge
    mysql-test/suite/binlog/t/binlog_unsafe.test:
      Manual merge
    mysql-test/suite/rpl/r/rpl_loaddata.result:
      Manual merge
    mysql-test/t/mysqlbinlog2.test:
      Manual merge
    9cf83298
mysqltest.c 227 KB