• unknown's avatar
    Fix merge problems and re-record output for legitimate changes. · e8236dc3
    unknown authored
    
    mysql-test/r/ctype_cp932_binlog_stm.result:
      New offsets because of quote marks.
    mysql-test/r/mysqlbinlog.result:
      Re-add variables removed in merge at file-vers 1.47.
    mysql-test/suite/binlog/r/binlog_database.result:
      create_string() output changes the quoting and inserts newlines.
    mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
      Change in quoting.
    mysql-test/suite/rpl/r/rpl_sp.result:
      Adds quotes and newlines in creation of routines in binlog.
    e8236dc3
rpl_innodb_mixed_dml.result 34.6 KB