• unknown's avatar
    Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 · 5cabc3a0
    unknown authored
    into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
    
    
    mysql-test/t/status.test:
      Auto merged
    mysql-test/extra/binlog_tests/binlog.test:
      manual merge
    mysql-test/suite/binlog/r/binlog_stm_binlog.result:
      manual merge
    sql/log.cc:
      manual merge
    5cabc3a0
status.test 5.66 KB