1. 16 Aug, 2013 1 commit
    • unknown's avatar
      MDEV-4820: Empty master does not give error for slave GTID position that does... · 37c2ba4d
      unknown authored
      MDEV-4820: Empty master does not give error for slave GTID position that does not exist in the binlog
      
      The main bug here was the following situation:
      
      Suppose we set up a completely new master2 as an extra multi-master to an
      existing slave that already has a different master1 for domain_id=0. When the
      slave tries to connect to master2, master2 will not have anything that slave
      requests in domain_id=0, but that is fine as master2 is supposedly meant to
      serve eg. domain_id=1. (This is MDEV-4485).
      
      But suppose that master2 then actually starts sending events from
      domain_id=0. In this case, the fix for MDEV-4485 was incomplete, and the code
      would fail to give the error that the position requested by the slave in
      domain_id=0 was missing from the binlogs of master2. This could lead to lost
      events or completely wrong replication.
      
      The patch for this bug fixes this issue.
      
      In addition, it cleans up the code a bit, getting rid of the fake_gtid_hash in
      the code. And the error message when slave and master have diverged due to
      alternate future is clarified, as requested in the bug description.
      
      37c2ba4d
  2. 06 Aug, 2013 2 commits
  3. 17 Jul, 2013 3 commits
  4. 16 Jul, 2013 9 commits
  5. 15 Jul, 2013 2 commits
  6. 11 Jul, 2013 2 commits
  7. 10 Jul, 2013 2 commits
    • unknown's avatar
      MDEV-4708: GTID strict mode doesn't work on a database with purged binlogs · 4c097224
      unknown authored
      When a new master is provisioned that does not have any old binlogs,
      the @@gtid_slave_pos is used to know where in the GTID history the
      provisioning happened. A slave is allowed to connect at the point of
      this value of @@gtid_slave_pos, even if that GTID is not in the
      binlogs on the new master.
      
      The code to handle this case when the binlog on the newly provisioned
      master is completely empty was just wrong (couple of typos). Clearly it
      had never been tested ... :-/
      4c097224
    • unknown's avatar
      MDEV-4708: GTID strict mode doesn't work on a database with purged binlogs · a142801f
      unknown authored
      When a new master is provisioned that does not have any old binlogs,
      the @@gtid_slave_pos is used to know where in the GTID history the
      provisioning happened. A slave is allowed to connect at the point of
      this value of @@gtid_slave_pos, even if that GTID is not in the
      binlogs on the new master.
      
      But --gtid-strict-mode did not correctly handle this case. When strict
      mode was enabled, an attempt to connect at the position would cause an
      error about holes in the binlog, which is not correct.
      
      This patch adds a hash of GTIDs that need to be treated specially by
      GTID strict mode to deal correctly with this case.
      a142801f
  8. 09 Jul, 2013 4 commits
    • Alexander Barkov's avatar
      Merge from 5.3 · 34b7c474
      Alexander Barkov authored
      34b7c474
    • Vladislav Vaintroub's avatar
      MDEV-4409 - Fix deadlock in MySQL key cache code, that can happen if there is... · 5f4318b6
      Vladislav Vaintroub authored
      MDEV-4409 - Fix deadlock in MySQL key cache code, that can happen if there is a key cache resize running in parallel with an update.
      
      If there is a key cache resize,a  thread writing to key cache, will pause waiting  until resize finishes. However this thread is won't be woken, because resize does not  signaling waiters anymore. This is a regression introduced in WL#86(segmented MyISAM key cache)
      The fix is to unconditionally release  threads waiting on resize_queue when resize  finishes, as in pre-WL#86 code.
      5f4318b6
    • Alexander Barkov's avatar
      Merge from 5.2 · da3c97c3
      Alexander Barkov authored
      modified:
        mysql-test/suite/plugins/r/fulltext_plugin.result
        mysql-test/suite/plugins/t/fulltext_plugin.test
        plugin/fulltext/plugin_example.c
        sql/sql_show.cc
      pending merges:
        Alexander Barkov 2013-07-09 [merge] Merge from 5.1
          Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninst...
          Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
      da3c97c3
    • Alexander Barkov's avatar
      Merge from 5.1 · 4555a0b3
      Alexander Barkov authored
      modified:
        mysql-test/suite/plugins/r/fulltext_plugin.result
        mysql-test/suite/plugins/t/fulltext_plugin.test
        plugin/fulltext/plugin_example.c
        sql/sql_show.cc
      pending merges:
        Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninstall ...
          Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
      4555a0b3
  9. 08 Jul, 2013 1 commit
    • Alexander Barkov's avatar
      Merging from 5.3 · 3f8c0271
      Alexander Barkov authored
      modified:
        include/my_time.h
        libmysql/libmysql.c
        mysql-test/r/adddate_454.result
        mysql-test/r/cast.result
        mysql-test/r/date_formats.result
        mysql-test/r/func_sapdb.result
        mysql-test/r/func_time.result
        mysql-test/r/mdev316.result
        mysql-test/r/parser.result
        mysql-test/r/partition_datatype.result
        mysql-test/r/partition_pruning.result
        mysql-test/r/type_date.result
        mysql-test/r/type_datetime.result
        mysql-test/suite/vcol/r/vcol_misc.result
        mysql-test/t/cast.test
        sql-common/my_time.c
        sql/field.cc
        sql/field_conv.cc
        sql/filesort.cc
        sql/item.cc
        sql/item.h
        sql/item_cmpfunc.cc
        sql/item_func.cc
        sql/item_strfunc.cc
        sql/item_timefunc.cc
        sql/sql_time.cc
      pending merges:
        Sergei Golubchik 2013-07-03 MDEV-4667 DATE('string') incompability betwe...
      3f8c0271
  10. 06 Jul, 2013 1 commit
  11. 05 Jul, 2013 3 commits
  12. 04 Jul, 2013 1 commit
  13. 03 Jul, 2013 1 commit
  14. 01 Jul, 2013 3 commits
  15. 28 Jun, 2013 4 commits
    • Alexander Barkov's avatar
      Merge · 3c10d0b0
      Alexander Barkov authored
      pending merges:
        Alexander Barkov 2013-06-28 A clean-up for MDEV-4634
      3c10d0b0
    • Alexander Barkov's avatar
      A clean-up for MDEV-4634 · b78e5617
      Alexander Barkov authored
      modified:
        sql/time.cc
      b78e5617
    • Alexander Barkov's avatar
      Merge from 5.3 · 985b6cb4
      Alexander Barkov authored
      modified:
        mysql-test/r/type_date.result
        mysql-test/r/type_datetime.result
        mysql-test/r/type_time.result
        mysql-test/t/type_date.test
        mysql-test/t/type_datetime.test
        mysql-test/t/type_time.test
        sql/item_func.cc
        sql/item_timefunc.cc
        sql/sql_time.cc
        sql/sql_time.h
      pending merges:
        Alexander Barkov 2013-06-28 MDEV-4634 Crash in CONVERT_TZ
      985b6cb4
    • Alexander Barkov's avatar
      MDEV-4634 Crash in CONVERT_TZ · 3c4db61e
      Alexander Barkov authored
      Item_func_min_max::get_date() did not check the
      returned value against the fuzzy_date flags, so
      it could return a bad value to the caller that
      expects a good date (e.h. CONVERT_TZ).
      
      
      modified:
        mysql-test/r/type_date.result
        mysql-test/r/type_datetime.result
        mysql-test/r/type_time.result
        mysql-test/t/type_date.test
        mysql-test/t/type_datetime.test
        mysql-test/t/type_time.test
        sql/item_func.cc
        sql/item_timefunc.cc
        sql/mysql_priv.h
        sql/time.cc
      3c4db61e
  16. 27 Jun, 2013 1 commit