• unknown's avatar
    Merge: bug#27417,23333 manual work for fixing tests and a source code. · 14f5002d
    unknown authored
    
    mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
      results changed due to 
      1. tt table made temporary is it's supposed to; 
      2. show master status is turned into binlog pos masking-out macro
      3. merge defect for select_insert::abort()
    mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
      masking-out binlog postions in the results via 
      source include/show_binlog_events.inc;
    sql/sql_insert.cc:
      merging defect in not applied hunk for select_insert::abort() is fixed
    14f5002d
binlog_stm_mix_innodb_myisam.result 20.2 KB