1. 10 May, 2017 4 commits
    • Marko Mäkelä's avatar
      MDEV-12679 purge_sys_t::~purge_sys_t(): Assertion `latch.magic_n == 0' failed... · e3a7f75a
      Marko Mäkelä authored
      MDEV-12679 purge_sys_t::~purge_sys_t(): Assertion `latch.magic_n == 0' failed on --bootstrap (CMAKE_BUILD_TYPE=Debug)
      
      rw_lock_free_func(): Assign lock->magic_n = 0 in debug builds,
      because sometimes, the assignment in the explicit destructor call
      is being optimized away.
      This was verified when using GCC 6.3.0 with -O3 -g -mtune=native
      on a Debian GNU/Linux 9.0 system on AMD64.
      e3a7f75a
    • Marko Mäkelä's avatar
      Fix some integer type mismatch. · 021d6365
      Marko Mäkelä authored
      Use uint32_t for the encryption key_id.
      
      When filling unsigned integer values into INFORMATION_SCHEMA tables,
      use the method Field::store(longlong, bool unsigned)
      instead of using Field::store(double).
      
      Fix also some miscellanous type mismatch related to ulint (size_t).
      021d6365
    • Oleksandr Byelkin's avatar
    • Marko Mäkelä's avatar
      MDEV-12762 Some files in current 10.2 tree seem to be reverted to an old state · 069d0472
      Marko Mäkelä authored
      The issue was a bad merge of MDEV-12253 from 10.1 to 10.2
      in commit f9cc3918.
      In that merge, I wrongly assumed that all test file conflicts
      for mysql-test/suite/encryption had been properly resolved in
      bb-10.2-MDEV-12253 (commit 76aa6be77635c7017459ce33b41c837c9acb606d)
      while in fact, some files there had been copied from the 10.1 branch.
      
      This commit is based on a manually done conflict resolution of
      the mysql-test/suite/encryption on the same merge, applied to
      the current 10.2 branch.
      
      As part of this commit, the test encryption.innodb-bad-key-change4
      which was shortly disabled due to MDEV-11336 will be re-enabled again.
      (While the test enables innodb_defragment, it does not fail even though
      enabling innodb_defragment currently has no effect.)
      069d0472
  2. 09 May, 2017 23 commits
  3. 08 May, 2017 13 commits