1. 06 Jun, 2013 4 commits
    • Sergei Golubchik's avatar
      10.0-base merge · 72ba9587
      Sergei Golubchik authored
      (without InnoDB - all InnoDB changes were ignored)
      72ba9587
    • Sergei Golubchik's avatar
      5.5 merge · 4749d40c
      Sergei Golubchik authored
      4749d40c
    • Vladislav Vaintroub's avatar
      fix compile error · 1ff1cb10
      Vladislav Vaintroub authored
      1ff1cb10
    • Michael Widenius's avatar
      Fixed timing failure in myisam-metadata.test · 5cf5a9a1
      Michael Widenius authored
      mysql-test/include/wait_show_condition.inc:
        Print failing statement if timeout
      mysql-test/r/myisam-metadata.result:
        Updated DBUG_SYNC
      mysql-test/t/myisam-metadata.test:
        Updated DBUG_SYNC.
        Removed wait_show_condtion, as this is not needed when we use DBUG_SYNC
        This should fix timing issues with the test
      mysys/thr_mutex.c:
        Added comments
      sql/sql_acl.cc:
        atoi -> atoll()  (Safety)
      storage/myisam/ha_myisam.cc:
        Send signal before mi_repair_by_sort.
      5cf5a9a1
  2. 05 Jun, 2013 3 commits
    • unknown's avatar
      Fix two small problems in previous push. · 64e53a0f
      unknown authored
      64e53a0f
    • unknown's avatar
      MDEV-26: Global transaction ID. · 5cb486d1
      unknown authored
      Fix problems related to reconnect. When we need to reconnect (ie. explict
      stop/start of just the IO thread by user, or automatic reconnect due to
      loosing network connection with the master), it is a bit complex to correctly
      resume at the right point without causing duplicate or missing events in the
      relay log. The previous code had multiple problems in this regard.
      
      With this patch, the problem is solved as follows. The IO thread keeps track
      (in memory) of which GTID was last queued to the relay log. If it needs to
      reconnect, it resumes at that GTID position. It also counts number of events
      received within the last, possibly partial, event group, and skips the same
      number of events after a reconnect, so that events already enqueued before the
      reconnect are not duplicated.
      
      (There is no need to keep any persistent state; whenever we restart slave
      threads after both of them being stopped (such as after server restart), we
      erase the relay logs and start over from the last GTID applied by SQL thread.
      But while the SQL thread is running, this patch is needed to get correct relay
      log).
      5cb486d1
    • Michael Widenius's avatar
      - Fixed compiler warning · fab9a55d
      Michael Widenius authored
      - Don't abort InnoDB if one can't allocate resources for AIO
        (this patch was in 5.5 and 10.0-base but was missing in 10.0)
      
      
      sql/mdl.cc:
        Fixed compiler warning
      storage/innobase/os/os0file.cc:
        Don't abort InnoDB if one can't allocate resources for AIO
      fab9a55d
  3. 03 Jun, 2013 1 commit
    • unknown's avatar
      MDEV-4605: Failing to load GTID slave position from rpl.gtid_slave_pos · 7ad47ab0
      unknown authored
      There were several cases where the slave GTID position was not loaded
      correctly before being used. This caused various failures such as
      corrupting the position at slave start and empty values of
      @@gtid_slave_pos and @@gtid_current_pos.
      
      Fixed by adding more checks for loaded position, and by always loading
      the position at server startup.
      7ad47ab0
  4. 01 Jun, 2013 2 commits
  5. 30 May, 2013 1 commit
  6. 29 May, 2013 2 commits
    • unknown's avatar
      MDEV-4485: Incorrect error handling in record_gtid(). · 6feadb10
      unknown authored
      Fix the error handling when access to the table mysql.gtid_slave_pos
      fails for whatever reason. Add some test cases.
      6feadb10
    • unknown's avatar
      MDEV-4485: Master did not allow slave to connect from the very start (empty... · 385780f5
      unknown authored
      MDEV-4485: Master did not allow slave to connect from the very start (empty GTID pos) if GTIDs from other multi_source master was present
      
      The idea in the code was to protect the user that tries to connect a slave
      to a master with completely different domains than what was intended. If
      none of the domains in the start position are present at all in the master
      binlog, we gave an error.
      
      However, this is a stupid idea. Because when a slave connects to a master
      to start replication from the very start of binlogs - such as when setting
      up new master->slave servers from scratch - there will be just this
      situation, the requested slave position is empty for all the domains in the
      master's binlog.
      
      So the code that gives this error is wrong, and the solution is simply to
      remove it.
      385780f5
  7. 28 May, 2013 8 commits
  8. 25 May, 2013 1 commit
  9. 24 May, 2013 1 commit
    • unknown's avatar
      MDEV-4475: Replication from MariaDB 10.0 to 5.5 does not work · 416aed25
      unknown authored
      The problem was the Gtid_list event which is logged to the binlog in
      10.0 and is not understood by the 5.5 server.
      
      This event is supposed to be replaced with a dummy event for 5.5
      servers. But the very first event logged in the very first binlog
      has an empty list of GTID, which makes the event too short to be
      replacable with an empty event.
      
      The fix is to pad the empty Gtid_list event to be big enough to
      be replacable by a dummy event.
      416aed25
  10. 23 May, 2013 2 commits
    • unknown's avatar
      MDEV-4520: Assertion `0' fails in Query_cache::end_of_result on concurrent... · b9ce8572
      unknown authored
      MDEV-4520: Assertion `0' fails in Query_cache::end_of_result on concurrent drop event and event execution
      
      If there is no net.vio then query cache cant't get data via net_real_write() so it is better just do not try to cache such query.
      b9ce8572
    • Vladislav Vaintroub's avatar
      MDEV-4566 : Failing DBUG_ASSERT() in SELECT SLEEP(), with threadpool. · 08ce9bfe
      Vladislav Vaintroub authored
      This bug only happens with long sleep()s ( > 5 sec), and in debug version.
      
      Analysis: 
      The assertion is caused by nested thd_wait_begin() calls, which is not an expected condition.
      -  "outer" thd_wait_begin()) , in Item_func_sleep::val_int()
      -  "inner" thd_wait_begin() in Interruptible_wait::wait(). This function periodically checks whether connection is still valid, via THD::is_connection(), which ends up  calling vio_io_wait()  with timeout parameter set to  0.
      
      
      Fix is not to call thd wait callback in vio_io_wait(), if timeout parameter is 0. There is no "waiting" in this case.
      08ce9bfe
  11. 22 May, 2013 2 commits
    • unknown's avatar
      MDEV-26: Global transaction ID. · 1cd6eb5f
      unknown authored
      Change of user interface to be more logical and more in line with expectations
      to work similar to old-style replication.
      
      User can now explicitly choose in CHANGE MASTER whether binlog position is
      taken into account (master_gtid_pos=current_pos) or not (master_gtid_pos=
      slave_pos) when slave connects to master.
      
      @@gtid_pos is replaced by three separate variables @@gtid_slave_pos (can
      be set by user, replicated GTIDs only), @@gtid_binlog_pos (read only), and
      @@gtid_current_pos (a combination of the two, most recent GTID within each
      domain). mysql.rpl_slave_state is renamed to mysql.gtid_slave_pos to match.
      
      This fixes MDEV-4474.
      1cd6eb5f
    • Vladislav Vaintroub's avatar
      MDEV-4548 - compile sphinx.so/dll and include into packages · 7ba2ff93
      Vladislav Vaintroub authored
      replaced snippets_udf.cc with the latest version (2.0.8 from sphinxsource.com), fixed trivial errors on Windows.
      It will be compiled and installed into plugins directory now.
      7ba2ff93
  12. 27 May, 2013 1 commit
  13. 24 May, 2013 1 commit
  14. 21 May, 2013 4 commits
  15. 20 May, 2013 7 commits