1. 21 Jan, 2014 2 commits
    • Sergey Petrunya's avatar
      Merge · a1a49ec9
      Sergey Petrunya authored
      a1a49ec9
    • Sergey Petrunya's avatar
      MDEV-5426: Assertion `toku_ft_needed_unlocked(src_h)' failed (errno=11) ... · 41208f6e
      Sergey Petrunya authored
      - the problem was caused by EXPLAIN INSERT SELECT. For that statement, 
        the code would call select_insert::prepare2(), which would call 
        handler->ha_start_bulk_insert().  The corresponding handler->end_bulk_insert() 
        call is made from select_insert::send_eof or select_insert::abort_result_set 
        which are never called for EXPLAIN INSERT SELECT.
      - Fixed by re-using approach of mysql-5.6: don't call ha_start_bulk_insert() if 
        we are in EXPLAIN.
      41208f6e
  2. 20 Jan, 2014 1 commit
  3. 14 Jan, 2014 1 commit
    • Michael Widenius's avatar
      Fix for MDEV-4117 @@global.relay_log_purge not per-master, conflicts between... · 0a20d762
      Michael Widenius authored
      Fix for MDEV-4117 @@global.relay_log_purge not per-master, conflicts between different masters in multisource replication
      
      The fix is to not change @relay_log_purge as part of the CHANGE MASTER.
      (There is no logical reason why this is done in the current source)
      
      mysql-test/suite/rpl/r/rpl_slave_status.result:
        Ensure that CHANGE MASTER doesn't change relay_log_purge
      mysql-test/suite/rpl/t/rpl_slave_status.test:
        Ensure that CHANGE MASTER doesn't change relay_log_purge
      sql/sql_repl.cc:
        Don't change relay_log_purge in CHANGE MASTER
      0a20d762
  4. 28 Dec, 2013 1 commit
  5. 23 Dec, 2013 1 commit
  6. 22 Dec, 2013 14 commits
  7. 20 Dec, 2013 3 commits
  8. 19 Dec, 2013 4 commits
  9. 17 Dec, 2013 10 commits
  10. 16 Dec, 2013 3 commits