• unknown's avatar
    Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 65243309
    unknown authored
    into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
    
    
    mysql-test/extra/rpl_tests/rpl_log.test:
      Auto merged
    mysql-test/r/rpl_insert_id.result:
      Auto merged
    mysql-test/r/rpl_replicate_do.result:
      Auto merged
    mysql-test/r/rpl_row_log.result:
      Auto merged
    mysql-test/r/rpl_skip_error.result:
      Auto merged
    mysql-test/t/rpl_replicate_do.test:
      Auto merged
    mysql-test/t/rpl_skip_error.test:
      Auto merged
    BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a:
      Auto merged
    BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734:
      Auto merged
    mysql-test/t/rpl_load_from_master.test:
      Auto merged
    65243309
rpl_skip_error.result 333 Bytes