• unknown's avatar
    Merge host.loc:/home/uchum/work/5.1-opt-33699 · d52a1a14
    unknown authored
    into  host.loc:/home/uchum/work/5.1-opt
    
    
    mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
      Merge with local tree (bug#33699).
    mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
      Merge with local tree (bug#33699).
    d52a1a14
rpl_extraMaster_Col.test 30.7 KB