• unknown's avatar
    Merge polly.local:/tmp/maint/bug25137/my50-bug25137 · 2fb6fbde
    unknown authored
    into  polly.local:/tmp/maint/bug25137/my51-bug25137
    
    
    mysql-test/extra/binlog_tests/ctype_cp932.test:
      Auto merged
    mysql-test/r/binlog_stm_ctype_cp932.result:
      Auto merged
    mysql-test/r/mysql.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/t/ctype_ucs2_def-master.opt:
      Auto merged
    mysql-test/t/ctype_ucs2_def.test:
      Auto merged
    mysql-test/t/mysql.test:
      Auto merged
    mysql-test/t/mysqlbinlog.test:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    mysql-test/r/innodb.result:
      Manual merge
    mysql-test/t/innodb.test:
      Manual merge
    mysql-test/t/sp.test:
      Manual merge
    2fb6fbde
innodb.result 91.4 KB