1. 08 Jan, 2018 3 commits
    • Jan Lindström's avatar
      MDEV-13262: innodb.deadlock_detect failed in buildbot · ae7e1b9b
      Jan Lindström authored
      There is a race condition on a test. con1 is the older transaction
      as it query started wait first. Test continues so that con1 gets
      lock wait timeout first. There is possibility that default connection
      gets lock timeout also or as con1 is rolled back it gets the locks
      it waited and does the update. Fixed by removing query outputs as
      they could vary and accepting success from default connection
      query.
      ae7e1b9b
    • Marko Mäkelä's avatar
      Merge 10.1 into 10.2 · 9ede5692
      Marko Mäkelä authored
      9ede5692
    • Marko Mäkelä's avatar
      MDEV-14874 innodb_encrypt_log corrupts the log when the LSN crosses 32-bit boundary · 16d308e2
      Marko Mäkelä authored
      This bug affects both writing and reading encrypted redo log in
      MariaDB 10.1, starting from version 10.1.3 which added support for
      innodb_encrypt_log. That is, InnoDB crash recovery and Mariabackup
      will sometimes fail when innodb_encrypt_log is used.
      
      MariaDB 10.2 or Mariabackup 10.2 or later versions are not affected.
      
      log_block_get_start_lsn(): Remove. This function would cause trouble if
      a log segment that is being read is crossing a 32-bit boundary of the LSN,
      because this function does not allow the most significant 32 bits of the
      LSN to change.
      
      log_blocks_crypt(), log_encrypt_before_write(), log_decrypt_after_read():
      Add the parameter "lsn" for the start LSN of the block.
      
      log_blocks_encrypt(): Remove (unused function).
      16d308e2
  2. 06 Jan, 2018 3 commits
  3. 05 Jan, 2018 8 commits
  4. 04 Jan, 2018 9 commits
    • Marko Mäkelä's avatar
      Merge branch 10.1 into 10.2 · c8e63644
      Marko Mäkelä authored
      c8e63644
    • Marko Mäkelä's avatar
      Merge 10.0 into 10.1 · 21470de1
      Marko Mäkelä authored
      21470de1
    • Marko Mäkelä's avatar
      4496fd71
    • Marko Mäkelä's avatar
      MDEV-14057 InnoDB GIS tests fail · 8dc77a72
      Marko Mäkelä authored
      Fix and enable some of the tests; some remain disabled.
      
      The tests innodb_gis.rtree_old and innodb_gis.row_format
      duplicated some versions of the test main.gis-rtree.
      Instead of duplicating, source that test, in a new test
      innodb_gis.innodb_gis_rtree.
      
      Introduce innodb_row_format.combinations. Due to this,
      ROW_FORMAT=COMPRESSED will not be covered in some tests
      where it is covered in MySQL 5.7.
      8dc77a72
    • Marko Mäkelä's avatar
      MDEV-14058 InnoDB Assertion failure !leaf on rem0rec.cc line 566 on test innodb_gis.rtree_recovery · 218dbf68
      Marko Mäkelä authored
      The function rtr_update_mbr_field_in_place() is generating
      MLOG_REC_UPDATE_IN_PLACE or MLOG_COMP_REC_UPDATE_IN_PLACE records
      on non-leaf pages, even though MLOG_WRITE_STRING would perfectly
      suffice for updating a fixed-length data field.
      
      btr_cur_parse_update_in_place(): If flags==7, the record may be
      from rtr_update_mbr_field_in_place(), and we must check if the
      page is a leaf page. Otherwise, assume that it is.
      
      btr_cur_update_in_place(): Assert that the page is a leaf page.
      218dbf68
    • Vladislav Vaintroub's avatar
      update libmariadb · b9e09453
      Vladislav Vaintroub authored
      b9e09453
    • Daniel Bartholomew's avatar
      bump the VERSION · 0f253d3e
      Daniel Bartholomew authored
      0f253d3e
    • Monty's avatar
      Fixed wrong arguments to printf and related functions · 5e0b13d1
      Monty authored
      Other things, mainly to get
      create_mysqld_error_find_printf_error tool to work:
      
      - Added protection to not include mysqld_error.h twice
      - Include "unireg.h" instead of "mysqld_error.h" in server
      - Added protection if ER_XX messages are already defined
      - Removed wrong calls to my_error(ER_OUTOFMEMORY) as
        my_malloc() and my_alloc will do this automatically
      - Added missing %s to ER_DUP_QUERY_NAME
      - Removed old and wrong calls to my_strerror() when using
        MY_ERROR_ON_RENAME (wrong merge)
      - Fixed deadlock error message from Galera. Before the extra
        information given to ER_LOCK_DEADLOCK was missing because
        ER_LOCK_DEADLOCK doesn't provide any extra information.
      
      I kept #ifdef mysqld_error_find_printf_error_used in sql_acl.h
      to make it easy to do this kind of check again in the future
      5e0b13d1
    • Sergei Petrunia's avatar
      Fix out-of-date comments. · c584a496
      Sergei Petrunia authored
      c584a496
  5. 03 Jan, 2018 7 commits
  6. 02 Jan, 2018 8 commits
  7. 01 Jan, 2018 2 commits