• unknown's avatar
    Fix after merge of 5.0, fix of a result file which somebody hadn't updated. · bac7f104
    unknown authored
    "mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
    partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)
    
    
    mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
      compared with 5.0, this part has to move to the wrappers as the arg of --start-position depends on row-based or statement-based replication
    mysql-test/r/binlog_row_mix_innodb_myisam.result:
      result update
    mysql-test/r/rpl_row_UUID.result:
      result update (somebody had forgotten to run row-based tests, the solution is to use "make test" :)
    mysql-test/t/binlog_row_mix_innodb_myisam.test:
      merge from 5.0
    mysql-test/t/binlog_stm_mix_innodb_myisam.test:
      merge form 5.0
    sql/mysqld.cc:
      fix after merge
    sql/sp_head.cc:
      fix after merge
    bac7f104
mysqld.cc 296 KB